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>

diff --git a/git-rebase.sh b/git-rebase.sh
index bdcea0ed703057e08fd4204245f4f0c8a308f8d0..6b9af962a9cee734510518e82cf2537441ed843a 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -208,16 +208,15 @@ do
                if test -d "$dotest"
                then
                        move_to_original_branch
                if test -d "$dotest"
                then
                        move_to_original_branch

-                       rm -r "$dotest"

                elif test -d .dotest
                then
                        dotest=.dotest
                        move_to_original_branch
                elif test -d .dotest
                then
                        dotest=.dotest
                        move_to_original_branch

-                       rm -r .dotest

                else
                        die "No rebase in progress?"
                fi
                else
                        die "No rebase in progress?"
                fi

-               git reset --hard ORIG_HEAD
+               git reset --hard $(cat $dotest/orig-head)
+               rm -r "$dotest"

                exit
                ;;
        --onto)
                exit
                ;;
        --onto)

diff --git a/t/t3407-rebase-abort.sh b/t/t3407-rebase-abort.sh
index 94bdd723306c7795c8a17095bad0925b662345d4..3417138a80989620519ac7c8bb48055fd0bdbf50 100755 (executable)
--- a/t/t3407-rebase-abort.sh
+++ b/t/t3407-rebase-abort.sh
@@ -29,7 +29,7 @@ test_expect_success 'rebase --abort' '
        test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase)
 '
 
        test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase)
 '
 

-test_expect_failure 'rebase --abort after --skip' '
+test_expect_success 'rebase --abort after --skip' '

        # Clean up the state from the previous one
        git reset --hard pre-rebase
        rm -rf .dotest
        # Clean up the state from the previous one
        git reset --hard pre-rebase
        rm -rf .dotest