threads / discuss / 23134

commit --amend neglecting return value

Subject: commit --amend neglecting return value

## tl;dr

4 messages between Mar 22, 2010 and Mar 22, 2010.

replies: 3people: 2as markdown or json

maximilian attems· Mar 22, 2010, 04:36 UTC · lore

hello,

bug is easily reproducible by

> foo

git add foo
git commit --amend
:q!
 1 files changed, 1 insertions(+), 8 deletions(-)
 create mode 100644 test

git --version
 git version 1.7.0.2

aboves is usage with vim as patch editor. The expected behaviour would be to have not foo add to repo. afair this feature^Wbug exists since loooong.

thanks + kind regards

-- 
maks

Brian Gernhardt· Mar 22, 2010, 05:16 UTC · re: maximilian attems · lore

Re: commit --amend neglecting return value

On Mar 22, 2010, at 12:36 AM, maximilian attems wrote:

Show 15 quoted lines

> bug is easily reproducible by
> 
>> foo
> git add foo
> git commit --amend
> :q!
> 1 files changed, 1 insertions(+), 8 deletions(-)
> create mode 100644 test
> 
> git --version
> git version 1.7.0.2
> 
> aboves is usage with vim as patch editor.
> The expected behaviour would be to have not foo add to repo.
> afair this feature^Wbug exists since loooong.

Vim returns 0 even if quit with :q!.  Killing vim from another terminal causes this:

--- 8< ---
Vim: Caught deadly signal TERM

Vim: Finished.
error: /Users/brian/bin/vim died of signal 15
error: There was a problem with the editor '/Users/brian/bin/vim'.
Please supply the message using either -m or -F option.
--- 8< ---

If you want to abort committing while editing the message, delete the entire message (in Vim: "0dG:wq^M") and git will reply "Aborting commit due to empty commit message."

~~ Brian

Brian Gernhardt· Mar 22, 2010, 05:20 UTC · re: Brian Gernhardt · lore

Re: commit --amend neglecting return value

On Mar 22, 2010, at 1:16 AM, Brian Gernhardt wrote:

> If you want to abort committing while editing the message, delete the entire message (in Vim: "0dG:wq^M") and git will reply "Aborting commit due to empty commit message."

Oops.  Obviously I meant "ggdG:wq^M".

Also, a quick search of :help and testing reveals that ":cq" causes Vim to exit with non-zero status which will cause git to abort the commit.

~~ Brian

maximilian attems· Mar 22, 2010, 18:39 UTC · re: Brian Gernhardt · lore

Re: commit --amend neglecting return value

On Mon, 22 Mar 2010, Brian Gernhardt wrote:

Show 8 quoted lines

> 
> On Mar 22, 2010, at 1:16 AM, Brian Gernhardt wrote:
> 
> > If you want to abort committing while editing the message, delete the entire message (in Vim: "0dG:wq^M") and git will reply "Aborting commit due to empty commit message."
> 
> Oops.  Obviously I meant "ggdG:wq^M".
> 
> Also, a quick search of :help and testing reveals that ":cq" causes Vim to exit with non-zero status which will cause git to abort the commit.

thanks for the pointer this is indeed very helpful. :)

kept hiting that bug in stressy situations, good to know a way out.