kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
David Kågedal 2007-01-31 17:12:03 +01:00 committed by Junio C Hamano
parent 9ebe6cf953
commit 6e598c326d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
git-rebase.sh
View File

@ -249,7 +249,8 @@ fi
git-update-index --refresh || exit git-update-index --refresh || exit
diff=$(git-diff-index --cached --name-status -r HEAD) diff=$(git-diff-index --cached --name-status -r HEAD)
case "$diff" in case "$diff" in
?*) echo "$diff" ?*) echo "cannot rebase: your index is not up-to-date"
echo "$diff"
exit 1 exit 1
;; ;;
esac esac