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 6a87c717e9cb8f0358ceca85ec7df8cf44f625d5..76e7f5522646e816ea506f3df1fc0ab0a9d0a277 100755 (executable)
--- 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