[PATCH] rebase -i: abort cleanly if the editor fails to launch
- From
Björn Gustavsson <bgustavsson@gmail.com>
- Date
- Dec 19, 2009, 12:04 UTC
- Message-ID
- <4B2CC133.9010704@gmail.com>
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> --- git-rebase--interactive.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 0bd3bf7..d529328 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -779,7 +779,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"
-- 1.6.6.rc3.dirty