author | Ian Ward Comfort <icomfort@stanford.edu> | |
Tue, 8 Jun 2010 08:16:11 +0000 (01:16 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 11 Jun 2010 16:01:51 +0000 (09:01 -0700) | ||
commit | b096374f4a2cec0403378c1e9b4fb5fe37b517f4 | |
tree | 8e9a3dae60847c26688219bd111ba535dca8677f | tree | snapshot |
parent | 2543d9b609d158f611e317738644e67cacac6b9a | commit | diff |
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>
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>
git-rebase--interactive.sh | diff | blob | history | |
t/t3404-rebase-interactive.sh | diff | blob | history |