From: Stephan Beyer Date: Sun, 22 Jun 2008 14:07:02 GMT Subject: [PATCH] git-rebase.sh: Add check if rebase is in progress Message-ID: <1214143622-28897-1-git-send-email-s-beyer@gmx.net> In-Reply-To: <485DC551.9020807@gmail.com> Signed-off-by: Stephan Beyer --- git-rebase.sh | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/git-rebase.sh b/git-rebase.sh index dd7dfe1..74f9c25 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -150,6 +150,9 @@ while test $# != 0 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" @@ -178,6 +181,9 @@ do exit ;; --skip) + test -d "$dotest" -o -d .dotest || + die "No rebase in progress?" + git reset --hard HEAD || exit $? if test -d "$dotest" then @@ -203,16 +209,16 @@ do 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 - elif test -d .dotest - then + else dotest=.dotest move_to_original_branch - else - die "No rebase in progress?" fi git reset --hard $(cat "$dotest/orig-head") rm -r "$dotest" -- 1.5.6.310.g344d