@matheusbsbs / matheus-bagliano / commits / e49ca974d6
Fork 0

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>

Björn Gustavsson committed Dec 19, 2009 at 13:04 UTC e49ca974d6ff2dda1ff4ee39e7cc33af33d1eb2a
1 file changed +1 -1
git-rebase--interactive.sh
+1 -1
@@ -770,7 +770,7 @@ EOF
770
771 cp "$TODO" "$TODO".backup
772 git_editor "$TODO" ||
773 - die "Could not execute editor"
773 + die_abort "Could not execute editor"
774
775 has_action "$TODO" ||
776 die_abort "Nothing to do"