Merge branch 'ph/checkout'

diff --git a/builtin-check-attr.c b/builtin-check-attr.c
index d94973379cee27c47426b61a13ae0f90508fed9b..cb783fc77e75515a02ed2268dfb37ee3bbd03749 100644 (file)
--- a/builtin-check-attr.c
+++ b/builtin-check-attr.c
@@ -4,7 +4,7 @@
 #include "quote.h"
 
 static const char check_attr_usage[] =
-"git-check-attr attr... [--] pathname...";
+"git check-attr attr... [--] pathname...";
 
 int cmd_check_attr(int argc, const char **argv, const char *prefix)
 {
@@ -56,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);
                }
        }