Changeset 782 for git/branches/dmik/builtin/check-attr.c

Timestamp:

Jun 23, 2014, 9:45:51 PM (11 years ago)

Author:

dmik

Message:

git: Merge version 2.0.0 from vendor to dmik branch.

Location:

git/branches/dmik

Files:

• . (modified) (1 prop)
• builtin/check-attr.c (modified) (4 diffs)

git/branches/dmik/builtin/check-attr.c ¶

@@ -9 +9 @@
 static int stdin_paths;
 static const char * const check_attr_usage[] = {
-"git check-attr [-a | --all | attr...] [--] pathname...",
-"git check-attr --stdin [-a | --all | attr...] < <list-of-paths>",
+N_("git check-attr [-a | --all | attr...] [--] pathname..."),
+N_("git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"),
 NULL
 };
 
-static int null_term_line;
+static int nul_term_line;
 
 static const struct option check_attr_options[] = {
-        OPT_BOOLEAN('a', "all", &all_attrs, "report all attributes set on file"),
-        OPT_BOOLEAN(0,  "cached", &cached_attrs, "use .gitattributes only from the index"),
-        OPT_BOOLEAN(0 , "stdin", &stdin_paths, "read file names from stdin"),
-        OPT_BOOLEAN('z', NULL, &null_term_line,
-                "input paths are terminated by a null character"),
+        OPT_BOOL('a', "all", &all_attrs, N_("report all attributes set on file")),
+        OPT_BOOL(0,  "cached", &cached_attrs, N_("use .gitattributes only from the index")),
+        OPT_BOOL(0 , "stdin", &stdin_paths, N_("read file names from stdin")),
+        OPT_BOOL('z', NULL, &nul_term_line,
+                 N_("terminate input and output records by a NUL character")),
         OPT_END()
 };
@@ -39 +39 @@
                         value = "unspecified";
 
-                quote_c_style(file, NULL, stdout, 0);
-                printf(": %s: %s\n", git_attr_name(check[j].attr), value);
+                if (nul_term_line) {
+                        printf("%s%c" /* path */
+                               "%s%c" /* attrname */
+                               "%s%c" /* attrvalue */,
+                               file, 0, git_attr_name(check[j].attr), 0, value, 0);
+                } else {
+                        quote_c_style(file, NULL, stdout, 0);
+                        printf(": %s: %s\n", git_attr_name(check[j].attr), value);
+                }
+
         }
 }
@@ -66 +74 @@
 {
         struct strbuf buf, nbuf;
-        int line_termination = null_term_line ? 0 : '\n';
+        int line_termination = nul_term_line ? 0 : '\n';
 
         strbuf_init(&buf, 0);
@@ -94 +102 @@
         struct git_attr_check *check;
         int cnt, i, doubledash, filei;
+
+        if (!is_bare_repository())
+                setup_work_tree();
 
         git_config(git_default_config, NULL);