Skip to content

Commit

Permalink
rebase: consistent error messages for staged and unstaged changes.
Browse files Browse the repository at this point in the history
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 <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Matthieu Moy authored and Junio C Hamano committed Aug 6, 2009
1 parent 18b0793 commit 4cfbe06
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions git-rebase.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4cfbe06

Please sign in to comment.