From: Björn Gustavsson <bgustavsson@gmail.com>
Date: Sat, 19 Dec 2009 12:04:03 +0000 (+0100)
Subject: rebase -i: abort cleanly if the editor fails to launch
X-Git-Tag: v1.6.6-rc4~1^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e49ca974d6ff2dda1ff4ee39e7cc33af33d1eb2a;p=git.git

rebase -i: abort cleanly if the editor fails to launch

If the user's configured editor is emacsclient, the editor
will fail to launch if emacs is not running and the git
command that tried to lanuch the editor will abort. For most
commands, all you have to do is to start emacs and repeat
the command.

The "git rebase -i" command, however, aborts without cleaning
the "$GIT_DIR/rebase-merge" directory if it fails to launch the
editor, so you'll need to do "git rebase --abort" before
repeating the rebase command.

Change "git rebase -i" to terminate using "die_abort" (instead of
with "die") if the initial launch of the editor fails.

Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 3853b513b..5014ae057 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -770,7 +770,7 @@ EOF
 
 		cp "$TODO" "$TODO".backup
 		git_editor "$TODO" ||
-			die "Could not execute editor"
+			die_abort "Could not execute editor"
 
 		has_action "$TODO" ||
 			die_abort "Nothing to do"