aboutsummaryrefslogtreecommitdiff
path: root/sha1_name.c
diff options
context:
space:
mode:
authorMike Hommey <mh@glandium.org>2008-03-01 11:32:14 +0100
committerJunio C Hamano <gitster@pobox.com>2008-03-01 23:52:00 -0800
commit48411d2233aec65b612ac2b1f50540ec60f0f568 (patch)
tree8500192f915d3cf5836015a3057f939738ad679d /sha1_name.c
parentf32086becc2b46bda0680ef178935546a64ad693 (diff)
downloadgit-48411d2233aec65b612ac2b1f50540ec60f0f568.tar.gz
git-48411d2233aec65b612ac2b1f50540ec60f0f568.tar.xz
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>
Diffstat (limited to 'sha1_name.c')
0 files changed, 0 insertions, 0 deletions