]> git.ipfire.org Git - thirdparty/git.git/commit - git-rebase--interactive.sh
rebase -i: abort cleanly if the editor fails to launch
authorBjörn Gustavsson <bgustavsson@gmail.com>
Sat, 19 Dec 2009 12:04:03 +0000 (13:04 +0100)
committerJunio C Hamano <gitster@pobox.com>
Sun, 20 Dec 2009 07:20:05 +0000 (23:20 -0800)
commite49ca974d6ff2dda1ff4ee39e7cc33af33d1eb2a
tree896a18b082db64f04883a7cdf81d74cc774d5e57
parentafab0fe052b8a6b36c3860f7673ee1e9731c1679
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>
git-rebase--interactive.sh