![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Mike Hommey <mh@glandium.org> | |
| Sat, 1 Mar 2008 10:32:14 +0000 (11:32 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 12 Mar 2008 02:30:33 +0000 (19:30 -0700) | ||
| commit | 4201bb5f7e408143dc5bf35497cc82bc803fe9fb | |
| tree | 1ffdcfe10713902a4490e02b12124a7f62a0d71f | tree | snapshot |
| parent | 92aeb994d3195d3601df2e37052d60f9a6738b61 | commit | diff |
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.
[jc: cherry-picked from 48411d and 4947cf9 on 'master']
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.
[jc: cherry-picked from 48411d and 4947cf9 on 'master']
Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-rebase.sh | diff | blob | history | |
| t/t3407-rebase-abort.sh | [new file with mode: 0755] | blob |