diff options
| author |  Ian Ward Comfort <icomfort@stanford.edu> | 2010-06-08 01:16:11 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-06-11 09:01:51 -0700 |
| commit | b096374f4a2cec0403378c1e9b4fb5fe37b517f4 (patch) | |
| tree | 8e9a3dae60847c26688219bd111ba535dca8677f /t/t4013/diff.diff-tree_-p_-m_master | |
| parent | Change C99 comments to old-style C comments (diff) | |
| download | tgif-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 't/t4013/diff.diff-tree_-p_-m_master')
0 files changed, 0 insertions, 0 deletions