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>
David Kågedal committed
Jan 31, 2007 at 17:12 UTC
6e598c326dc4217c387fd797d182dc2ac0a0fc03
1 file changed
+2
-1
git-rebase.sh
+2
-1
@@ -249,7 +249,8 @@ fi
249
git-update-index --refresh || exit
250
diff=$(git-diff-index --cached --name-status -r HEAD)
251
case "$diff" in
252
-?*) echo "$diff"
252
+?*) echo "cannot rebase: your index is not up-to-date"
253
+ echo "$diff"
254
exit 1
255
;;
256
esac