mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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>
This commit is contained in:
parent
9ebe6cf953
commit
6e598c326d
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue