enable whitespace checking of test scripts

diff --git a/builtin-describe.c b/builtin-describe.c
index 08d18507ac99a6c852f04d5b069857347dc5c0b8..3da99c1d06f1eeb85e760036dc881282558603d6 100644 (file)
--- a/builtin-describe.c
+++ b/builtin-describe.c
@@ -17,9 +17,11 @@ static const char * const describe_usage[] = {
 static int debug;      /* Display lots of verbose info */
 static int all;        /* Default to annotated tags only */
 static int tags;       /* But allow any tags if --tags is specified */
+static int longformat;
 static int abbrev = DEFAULT_ABBREV;
 static int max_candidates = 10;
 const char *pattern = NULL;
+static int always;
 
 struct commit_name {
        struct tag *tag;
@@ -78,12 +80,13 @@ static int get_name(const char *path, const unsigned char *sha1, int flag, void
         * Otherwise only annotated tags are used.
         */
        if (might_be_tag) {
-               if (is_tag) {
+               if (is_tag)
                        prio = 2;
-                       if (pattern && fnmatch(pattern, path + 10, 0))
-                               prio = 0;
-               } else
+               else
                        prio = 1;
+
+               if (pattern && fnmatch(pattern, path + 10, 0))
+                       prio = 0;
        }
        else
                prio = 0;
@@ -155,7 +158,7 @@ static void display_name(struct commit_name *n)
 {
        if (n->prio == 2 && !n->tag) {
                n->tag = lookup_tag(n->sha1);
-               if (!n->tag || !n->tag->tag)
+               if (!n->tag || parse_tag(n->tag) || !n->tag->tag)
                        die("annotated tag %s not available", n->path);
                if (strcmp(n->tag->tag, n->path))
                        warning("tag '%s' is really '%s' here", n->tag->tag, n->path);
@@ -167,6 +170,11 @@ static void display_name(struct commit_name *n)
                printf("%s", n->path);
 }
 
+static void show_suffix(int depth, const unsigned char *sha1)
+{
+       printf("-%d-g%s", depth, find_unique_abbrev(sha1, abbrev));
+}
+
 static void describe(const char *arg, int last_one)
 {
        unsigned char sha1[20];
@@ -191,7 +199,12 @@ static void describe(const char *arg, int last_one)
 
        n = cmit->util;
        if (n) {
+               /*
+                * Exact match to an existing ref.
+                */
                display_name(n);
+               if (longformat)
+                       show_suffix(0, n->tag->tagged->sha1);
                printf("\n");
                return;
        }
@@ -246,8 +259,14 @@ static void describe(const char *arg, int last_one)
                }
        }
 
-       if (!match_cnt)
-               die("cannot describe '%s'", sha1_to_hex(cmit->object.sha1));
+       if (!match_cnt) {
+               const unsigned char *sha1 = cmit->object.sha1;
+               if (always) {
+                       printf("%s\n", find_unique_abbrev(sha1, abbrev));
+                       return;
+               }
+               die("cannot describe '%s'", sha1_to_hex(sha1));
+       }
 
        qsort(all_matches, match_cnt, sizeof(all_matches[0]), compare_pt);
 
@@ -277,8 +296,7 @@ static void describe(const char *arg, int last_one)
 
        display_name(all_matches[0].name);
        if (abbrev)
-               printf("-%d-g%s", all_matches[0].depth,
-                      find_unique_abbrev(cmit->object.sha1, abbrev));
+               show_suffix(all_matches[0].depth, cmit->object.sha1);
        printf("\n");
 
        if (!last_one)
@@ -293,6 +311,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
                OPT_BOOLEAN(0, "debug",      &debug, "debug search strategy on stderr"),
                OPT_BOOLEAN(0, "all",        &all, "use any ref in .git/refs"),
                OPT_BOOLEAN(0, "tags",       &tags, "use any tag in .git/refs/tags"),
+               OPT_BOOLEAN(0, "long",       &longformat, "always use long format"),
                OPT__ABBREV(&abbrev),
                OPT_SET_INT(0, "exact-match", &max_candidates,
                            "only output exact matches", 0),
@@ -300,6 +319,8 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
                            "consider <n> most recent tags (default: 10)"),
                OPT_STRING(0, "match",       &pattern, "pattern",
                           "only consider tags matching <pattern>"),
+               OPT_BOOLEAN(0, "always",     &always,
+                          "show abbreviated commit object as fallback"),
                OPT_END(),
        };
 
@@ -311,12 +332,17 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
 
        save_commit_buffer = 0;
 
+       if (longformat && abbrev == 0)
+               die("--long is incompatible with --abbrev=0");
+
        if (contains) {
-               const char **args = xmalloc((6 + argc) * sizeof(char*));
+               const char **args = xmalloc((7 + argc) * sizeof(char*));
                int i = 0;
                args[i++] = "name-rev";
                args[i++] = "--name-only";
                args[i++] = "--no-undefined";
+               if (always)
+                       args[i++] = "--always";
                if (!all) {
                        args[i++] = "--tags";
                        if (pattern) {