aboutsummaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorIan Ward Comfort <icomfort@stanford.edu>2010-06-08 01:16:11 -0700
committerJunio C Hamano <gitster@pobox.com>2010-06-11 09:01:51 -0700
commitb096374f4a2cec0403378c1e9b4fb5fe37b517f4 (patch)
tree8e9a3dae60847c26688219bd111ba535dca8677f /git-rebase--interactive.sh
parent2543d9b609d158f611e317738644e67cacac6b9a (diff)
downloadgit-b096374f4a2cec0403378c1e9b4fb5fe37b517f4.tar.gz
git-b096374f4a2cec0403378c1e9b4fb5fe37b517f4.tar.xz
rebase -i: Abort cleanly if new base cannot be checked out
Untracked content in the working tree may prevent rebase -i from checking out the new base onto which it wants to replay commits, if the new base commit includes files at those (now untracked) paths. Currently, rebase -i dies uncleanly in this situation, updating ORIG_HEAD and leaving a useless .git/rebase-merge directory, with which the user can do nothing useful except rebase --abort. Make rebase -i abort the procedure itself instead, as non-interactive rebase already does, and add a test for this behavior. Signed-off-by: Ian Ward Comfort <icomfort@stanford.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--interactive.sh')
-rwxr-xr-xgit-rebase--interactive.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 436b7f597..6b86abc64 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -974,8 +974,9 @@ EOF
test -d "$REWRITTEN" || test -n "$NEVER_FF" || skip_unnecessary_picks
+ output git checkout $ONTO || die_abort "could not detach HEAD"
git update-ref ORIG_HEAD $HEAD
- output git checkout $ONTO && do_rest
+ do_rest
;;
esac
shift