From c5e09c1fbec5dc1c15bcfe21e1a600f9e4b4e419 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 12 Feb 2006 13:05:53 -0800 Subject: [PATCH] git-commit: show dirtiness including index. Earlier, when we switched a branch we used diff-files to show paths that are dirty in the working tree. But we allow switching branches with updated index ("read-tree -m -u $old $new" works that way), and only showing paths that have differences in the working tree but not paths that are different in index was confusing. This shows both as modified from the top commit of the branch we just have switched to. Signed-off-by: Junio C Hamano --- git-checkout.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git-checkout.sh b/git-checkout.sh index d99688fb..6a87c717 100755 --- a/git-checkout.sh +++ b/git-checkout.sh @@ -165,7 +165,8 @@ else exit 0 ) saved_err=$? - git diff-files --name-status + test "$new" = "$old" || + git diff-index --name-status "$new" (exit $saved_err) fi -- 2.11.0