Merge branch 'rj/quietly-create-dep-dir'

diff --git a/builtin/check-attr.c b/builtin/check-attr.c
index 6cf6421399644b359e08ea84493de419c71bc941..708988a0e1a318fb737624f489d01e0686cd0611 100644 (file)
--- a/builtin/check-attr.c
+++ b/builtin/check-attr.c
@@ -4,16 +4,18 @@
 #include "quote.h"
 #include "parse-options.h"
 
+static int all_attrs;
 static int stdin_paths;
 static const char * const check_attr_usage[] = {
-"git check-attr attr... [--] pathname...",
-"git check-attr --stdin attr... < <list-of-paths>",
+"git check-attr [-a | --all | attr...] [--] pathname...",
+"git check-attr --stdin [-a | --all | attr...] < <list-of-paths>",
 NULL
 };
 
 static int null_term_line;
 
 static const struct option check_attr_options[] = {
+       OPT_BOOLEAN('a', "all", &all_attrs, "report all attributes set on file"),
        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"),
@@ -39,15 +41,26 @@ static void output_attr(int cnt, struct git_attr_check *check,
        }
 }
 
-static void check_attr(int cnt, struct git_attr_check *check,
-       const char *file)
+static void check_attr(const char *prefix, int cnt,
+       struct git_attr_check *check, const char *file)
 {
-       if (git_checkattr(file, cnt, check))
-               die("git_checkattr died");
-       output_attr(cnt, check, file);
+       char *full_path =
+               prefix_path(prefix, prefix ? strlen(prefix) : 0, file);
+       if (check != NULL) {
+               if (git_check_attr(full_path, cnt, check))
+                       die("git_check_attr died");
+               output_attr(cnt, check, file);
+       } else {
+               if (git_all_attrs(full_path, &cnt, &check))
+                       die("git_all_attrs died");
+               output_attr(cnt, check, file);
+               free(check);
+       }
+       free(full_path);
 }
 
-static void check_attr_stdin_paths(int cnt, struct git_attr_check *check)
+static void check_attr_stdin_paths(const char *prefix, int cnt,
+       struct git_attr_check *check)
 {
        struct strbuf buf, nbuf;
        int line_termination = null_term_line ? 0 : '\n';
@@ -61,7 +74,7 @@ static void check_attr_stdin_paths(int cnt, struct git_attr_check *check)
                                die("line is badly quoted");
                        strbuf_swap(&buf, &nbuf);
                }
-               check_attr(cnt, check, buf.buf);
+               check_attr(prefix, cnt, check, buf.buf);
                maybe_flush_or_die(stdout, "attribute to stdout");
        }
        strbuf_release(&buf);
@@ -92,19 +105,28 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix)
                        doubledash = i;
        }
 
-       /* Check attribute argument(s): */
-       if (doubledash == 0) {
+       /* Process --all and/or attribute arguments: */
+       if (all_attrs) {
+               if (doubledash >= 1)
+                       error_with_usage("Attributes and --all both specified");
+
+               cnt = 0;
+               filei = doubledash + 1;
+       } else if (doubledash == 0) {
                error_with_usage("No attribute specified");
        } else if (doubledash < 0) {
-               /*
-                * There is no double dash; treat the first
-                * argument as an attribute.
-                */
                if (!argc)
                        error_with_usage("No attribute specified");
 
-               cnt = 1;
-               filei = 1;
+               if (stdin_paths) {
+                       /* Treat all arguments as attribute names. */
+                       cnt = argc;
+                       filei = argc;
+               } else {
+                       /* Treat exactly one argument as an attribute name. */
+                       cnt = 1;
+                       filei = 1;
+               }
        } else {
                cnt = doubledash;
                filei = doubledash + 1;
@@ -119,22 +141,27 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix)
                        error_with_usage("No file specified");
        }
 
-       check = xcalloc(cnt, sizeof(*check));
-       for (i = 0; i < cnt; i++) {
-               const char *name;
-               struct git_attr *a;
-               name = argv[i];
-               a = git_attr(name);
-               if (!a)
-                       return error("%s: not a valid attribute name", name);
-               check[i].attr = a;
+       if (all_attrs) {
+               check = NULL;
+       } else {
+               check = xcalloc(cnt, sizeof(*check));
+               for (i = 0; i < cnt; i++) {
+                       const char *name;
+                       struct git_attr *a;
+                       name = argv[i];
+                       a = git_attr(name);
+                       if (!a)
+                               return error("%s: not a valid attribute name",
+                                       name);
+                       check[i].attr = a;
+               }
        }
 
        if (stdin_paths)
-               check_attr_stdin_paths(cnt, check);
+               check_attr_stdin_paths(prefix, cnt, check);
        else {
                for (i = filei; i < argc; i++)
-                       check_attr(cnt, check, argv[i]);
+                       check_attr(prefix, cnt, check, argv[i]);
                maybe_flush_or_die(stdout, "attribute to stdout");
        }
        return 0;