git-rebase.sh: Add check if rebase is in progress

"git rebase --continue" and friends gave nonsense errors when there is no
rebase in progress.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-rebase.sh b/git-rebase.sh
index dd7dfe123c15a4b281c4a25a77887150b4a5dbb5..e2d85eeeab79e60ef46a65cfee1fb4682dd4ba68 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -150,6 +150,9 @@ while test $# != 0
 do
        case "$1" in
        --continue)
 do
        case "$1" in
        --continue)

+               test -d "$dotest" -o -d .dotest ||
+                       die "No rebase in progress?"
+

                git diff-files --quiet --ignore-submodules || {
                        echo "You must edit all merge conflicts and then"
                        echo "mark them as resolved using git add"
                git diff-files --quiet --ignore-submodules || {
                        echo "You must edit all merge conflicts and then"
                        echo "mark them as resolved using git add"


@@ -178,6 +181,9 @@ do
                exit
                ;;
        --skip)
                exit
                ;;
        --skip)

+               test -d "$dotest" -o -d .dotest ||
+                       die "No rebase in progress?"
+

                git reset --hard HEAD || exit $?
                if test -d "$dotest"
                then
                git reset --hard HEAD || exit $?
                if test -d "$dotest"
                then


@@ -203,16 +209,16 @@ do
                exit
                ;;
        --abort)
                exit
                ;;
        --abort)

+               test -d "$dotest" -o -d .dotest ||
+                       die "No rebase in progress?"
+

                git rerere clear
                if test -d "$dotest"
                then
                        move_to_original_branch
                git rerere clear
                if test -d "$dotest"
                then
                        move_to_original_branch

-               elif test -d .dotest
-               then
+               else

                        dotest=.dotest
                        move_to_original_branch
                        dotest=.dotest
                        move_to_original_branch

-               else
-                       die "No rebase in progress?"

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