summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorDavid Kågedal <davidk@lysator.liu.se>2007-01-31 17:12:03 +0100
committerJunio C Hamano <junkio@cox.net>2007-01-31 13:16:52 -0800
commit6e598c326dc4217c387fd797d182dc2ac0a0fc03 (patch)
tree84c401659f2ebd199995ffc479864485906d9c43 /git-rebase.sh
parent9ebe6cf953123ce904fe6930991694e3a3c79c17 (diff)
downloadgit-6e598c326dc4217c387fd797d182dc2ac0a0fc03.tar.gz
Improved error message from git-rebase
If the index wasn't clean, git-rebase would simply show the output from git-diff-index with no further comment to the user. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-xgit-rebase.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index 99cedadda1..9d2f71d15c 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -249,7 +249,8 @@ fi
git-update-index --refresh || exit
diff=$(git-diff-index --cached --name-status -r HEAD)
case "$diff" in
-?*) echo "$diff"
+?*) echo "cannot rebase: your index is not up-to-date"
+ echo "$diff"
exit 1
;;
esac