X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-rebase.sh;h=18bc6946cfa592c11cf7499b1c1ff9a6cb378b26;hb=bba287531b3a845faa032a8fef3e6d70d185c89b;hp=84b5173f936f89ef7750cc9d5b9f6b041c8aef1f;hpb=0e987a12fc1d481d81ad9c56f4714efb08667213;p=git.git

diff --git a/git-rebase.sh b/git-rebase.sh
index 84b5173f9..18bc6946c 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -181,10 +181,8 @@ run_pre_rebase_hook () {
 	if test -z "$OK_TO_SKIP_PRE_REBASE" &&
 	   test -x "$GIT_DIR/hooks/pre-rebase"
 	then
-		"$GIT_DIR/hooks/pre-rebase" ${1+"$@"} || {
-			echo >&2 "The pre-rebase hook refused to rebase."
-			exit 1
-		}
+		"$GIT_DIR/hooks/pre-rebase" ${1+"$@"} ||
+		die "The pre-rebase hook refused to rebase."
 	fi
 }
 
@@ -385,8 +383,7 @@ fi
 
 # The tree must be really really clean.
 if ! git update-index --ignore-submodules --refresh; then
-	echo >&2 "cannot rebase: you have unstaged changes"
-	exit 1
+	die "cannot rebase: you have unstaged changes"
 fi
 diff=$(git diff-index --cached --name-status -r --ignore-submodules HEAD --)
 case "$diff" in