From 4cfbe06fc788aad7bb4e5ea0c2c93345840acc28 Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Wed, 5 Aug 2009 16:56:25 +0200 Subject: [PATCH] rebase: consistent error messages for staged and unstaged changes. Previous version expose the output of the plumbing update-index to the user, which novice users have difficulty to understand. We still need to run update-index to refresh the cache (if diff.autorefreshindex is false, git diff won't do it). Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano --- git-rebase.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/git-rebase.sh b/git-rebase.sh index 18bc6946c..3555d17a5 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -382,8 +382,10 @@ else fi # The tree must be really really clean. -if ! git update-index --ignore-submodules --refresh; then - die "cannot rebase: you have unstaged changes" +if ! git update-index --ignore-submodules --refresh > /dev/null; then + echo >&2 "cannot rebase: you have unstaged changes" + git diff --name-status -r --ignore-submodules -- >&2 + exit 1 fi diff=$(git diff-index --cached --name-status -r --ignore-submodules HEAD --) case "$diff" in -- 2.26.2