undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase: use plumbing to show dirty state

Browse Source 
Commit 4cfbe06 introduced the use of "git diff" to show
dirty state in a format more familiar to users. However, it
should have used the plumbing "git diff-files" instead.

Not only is it good practice in general to use plumbing in
scripts, but in this case we really don't want the automatic
pager to kick in for an error message.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2009-09-09 10:59:37 -04:00 committed by Junio C Hamano
parent 25fc1786ab
commit 0c3d3ac352
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-rebase.sh
View File

@ -387,7 +387,7 @@ fi
# The tree must be really really clean. # The tree must be really really clean.
if ! git update-index --ignore-submodules --refresh > /dev/null; then if ! git update-index --ignore-submodules --refresh > /dev/null; then
echo >&2 "cannot rebase: you have unstaged changes" echo >&2 "cannot rebase: you have unstaged changes"
git diff --name-status -r --ignore-submodules -- >&2 git diff-files --name-status -r --ignore-submodules -- >&2
exit 1 exit 1
fi fi
diff=$(git diff-index --cached --name-status -r --ignore-submodules HEAD --) diff=$(git diff-index --cached --name-status -r --ignore-submodules HEAD --)