git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'

diff --git a/builtin-check-attr.c b/builtin-check-attr.c
index 9d77f76ff1230df76278b528ef44d6837edb2741..6afdfa10a166a97c1115b1430221262228622c5c 100644 (file)
--- a/builtin-check-attr.c
+++ b/builtin-check-attr.c
@@ -1,4 +1,5 @@
 #include "builtin.h"
+#include "cache.h"
 #include "attr.h"
 #include "quote.h"
 
@@ -10,6 +11,10 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix)
        struct git_attr_check *check;
        int cnt, i, doubledash;
 
+       if (read_cache() < 0) {
+               die("invalid cache");
+       }
+
        doubledash = -1;
        for (i = 1; doubledash < 0 && i < argc; i++) {
                if (!strcmp(argv[i], "--"))
@@ -51,7 +56,7 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix)
                        else if (ATTR_UNSET(value))
                                value = "unspecified";
 
-                       write_name_quoted("", 0, argv[i], 1, stdout);
+                       quote_c_style(argv[i], NULL, stdout, 0);
                        printf(": %s: %s\n", argv[j+1], value);
                }
        }