| commit | 48411d2233aec65b612ac2b1f50540ec60f0f568 | |
| author | Mike Hommey <mh@glandium.org> | |
| Sat, 1 Mar 2008 10:32:14 +0000 (1 11:32 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 2 Mar 2008 07:52:00 +0000 (1 23:52 -0800) | ||
| tree | 8500192f915d3cf5836015a3057f939738ad679d | treesnapshot (tar.gz zip) |
| parent | f32086becc2b46bda0680ef178935546a64ad693 | commitdiff |
git rebase --abort: always restore the right commit
Previously, --abort would end by git resetting to ORIG_HEAD, but some
commands, such as git reset --hard (which happened in git rebase --skip,
but could just as well be typed by the user), would have already modified
ORIG_HEAD.
Just use the orig-head we store in $dotest instead.
Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Previously, --abort would end by git resetting to ORIG_HEAD, but some
commands, such as git reset --hard (which happened in git rebase --skip,
but could just as well be typed by the user), would have already modified
ORIG_HEAD.
Just use the orig-head we store in $dotest instead.
Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-rebase.sh | diffblobblamehistory | |
| t/t3407-rebase-abort.sh | diffblobblamehistory |