Merge branch 'fix'
authorJunio C Hamano <junkio@cox.net>
Wed, 15 Feb 2006 01:56:07 +0000 (17:56 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 15 Feb 2006 01:56:07 +0000 (17:56 -0800)
* fix:
  checkout: fix dirty-file display.

git-checkout.sh

index 6a87c71..76e7f55 100755 (executable)
@@ -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