From: David Kågedal <davidk@lysator.liu.se>
Date: Wed, 31 Jan 2007 16:12:03 +0000 (+0100)
Subject: Improved error message from git-rebase
X-Git-Tag: v1.5.0-rc3~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6e598c326dc4217c387fd797d182dc2ac0a0fc03;p=thirdparty%2Fgit.git

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>
---

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