From: Wincent Colaiuta <win@wincent.com>
Date: Tue, 02 Feb 2010 22:06:29 GMT
Subject: Re: [BUG] - "git commit --amend" commits, when exiting the editor with no changes written
Message-ID: <77153A83-158D-4D36-A622-7AA3947C7D52@wincent.com>
In-Reply-To: <76c5b8581002021356m52bb1817k9a4a29da0d4b681d@mail.gmail.com>

El 02/02/2010, a las 22:56, Eugene Sajine escribió:

>>
>> As has already been pointed out, an extremely common workflow for  
>> "git
>> commit --amend" is to include additional changes that were  
>> accidentally
>> overlooked  in the initial commit, and no changes are made to the  
>> commit
>> message.
>>
>> Changing the behavior would break that perfectly reasonable,
>> widely-practised workflow, and _that_ would be 100% not ok.
>
> I'm not against that workflow - I'm not forcing anybody to change the
> commit message. The thing I'm talking about is roughly that it should
> NOT treat the result of command ":q" the same way as the command
> ":wq".

Why should Git care about how you exited from your EDITOR? All it  
should care about is the contents of the commit message, and the exit  
code of the editor.

> For example IF there is a variable somewhere where message is stored:
> For new commit message it is NULL and when commit is ready it is set
> up to "message". We check If it is not empty and not NULL (:wq
> executed),  then we can commit.
> For "prepopulated" messages this variable can be is set to "message"
> from the beginning, so it doesn't matter if you're writing changes or
> not the check will always be true, so we can commit.

I don't understand what change you're asking for, as things already  
work as you've just described (the "variable" is the file, .git/ 
COMMIT_EDITMSG).

> If the implementation would be like this, then I would propose to
> clean up this variable after the prepopulated message is populated, so
> it won't use it blindly, but only after you're overwriting the message
> (even if the message is not changed).

Here is where you've lost me. Not sure what you mean here, nor how  
you're going to maintain the existing behavior for all of the people  
who have grown used to it over a long, long period of time.

Wincent