From 6e598c326dc4217c387fd797d182dc2ac0a0fc03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20K=C3=A5gedal?= Date: Wed, 31 Jan 2007 17:12:03 +0100 Subject: [PATCH] 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 --- git-rebase.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- GitLab