Skip to content

Commit

Permalink
Improved error message from git-rebase
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
dkagedal authored and Junio C Hamano committed Jan 31, 2007
1 parent 9ebe6cf commit 6e598c3
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion git-rebase.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6e598c3

Please sign in to comment.