merge-recursive: handle file mode changes

[git.git] / git-rebase.sh

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
-                       rm -r "$dotest"
                elif test -d .dotest
                then
                        dotest=.dotest
                        move_to_original_branch
-                       rm -r .dotest
                else
                        die "No rebase in progress?"
                fi
-               git reset --hard ORIG_HEAD
+               git reset --hard $(cat $dotest/orig-head)
+               rm -r "$dotest"
                exit
                ;;
        --onto)