From: Junio C Hamano <junkio@cox.net>
Date: Wed, 15 Feb 2006 00:05:57 +0000 (-0800)
Subject: checkout: fix dirty-file display.
X-Git-Tag: v1.2.1~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=504fe714fe642b375992bb913075bee0d0bc1bbd;p=git.git

checkout: fix dirty-file display.

When we refused to switch branches, we incorrectly showed
differences from the branch we would have switched to.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-checkout.sh b/git-checkout.sh
index 6a87c717e..76e7f5522 100755
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -165,8 +165,10 @@ else
 	exit 0
     )
     saved_err=$?
-    test "$new" = "$old" ||
-	git diff-index --name-status "$new"
+    if test "$saved_err" = 0
+    then
+	test "$new" = "$old" || git diff-index --name-status "$new"
+    fi
     (exit $saved_err)
 fi