From 0c3d3ac352427738e7c4393c0a959e0e698a0c7a Mon Sep 17 00:00:00 2001 From: Jeff King Date: Wed, 9 Sep 2009 10:59:37 -0400 Subject: [PATCH] rebase: use plumbing to show dirty state 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 Signed-off-by: Junio C Hamano --- git-rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-rebase.sh b/git-rebase.sh index 2315d95a9f..6ec155cf03 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -387,7 +387,7 @@ fi # The tree must be really really clean. 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 + git diff-files --name-status -r --ignore-submodules -- >&2 exit 1 fi diff=$(git diff-index --cached --name-status -r --ignore-submodules HEAD --) -- 2.11.4.GIT