[PATCH] Clean up .dotest if an error occurs before rebase work starts
From: Robin Rosenberg <hidden>
Date: 2016-06-15 22:43:33
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Robin Rosenberg <redacted> --- git-rebase.sh | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index 3bd66b0..81c48d1 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh@@ -253,23 +253,33 @@ else fi # The tree must be really really clean. -git update-index --refresh || exit +git update-index --refresh || { + rm -rf .dotest + exit 1 +} + diff=$(git diff-index --cached --name-status -r HEAD) case "$diff" in ?*) echo "cannot rebase: your index is not up-to-date" echo "$diff" + rm -rf .dotest exit 1 ;; esac # The upstream head must be given. Make sure it is valid. upstream_name="$1" -upstream=`git rev-parse --verify "${upstream_name}^0"` || - die "invalid upstream $upstream_name" +upstream=`git rev-parse --verify "${upstream_name}^0"` || { + rm -rf .dotest + die "invalid upstream $upstream_name" +} # Make sure the branch to rebase onto is valid. onto_name=${newbase-"$upstream_name"} -onto=$(git rev-parse --verify "${onto_name}^0") || exit +onto=$(git rev-parse --verify "${onto_name}^0") || { + rm -rf .dotest + exit 1 +} # If a hook exists, give it a chance to interrupt if test -x "$GIT_DIR/hooks/pre-rebase"
--
1.5.3