describe: fix --long output

An error while hand-merging broke the new "--long" option.

This should fix it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-describe.c b/builtin-describe.c
index c549d362b27c422b92dbcdd3681e22b7523e0f48..43be671827ee1ec1b9bebb61f803059e674ad5a2 100644 (file)
--- a/builtin-describe.c
+++ b/builtin-describe.c
@@ -166,9 +166,11 @@ static void display_name(struct commit_name *n)
                printf("%s", n->tag->tag);
        else
                printf("%s", n->path);
                printf("%s", n->tag->tag);
        else
                printf("%s", n->path);

-       if (longformat)
-               printf("-0-g%s",
-                      find_unique_abbrev(n->tag->tagged->sha1, abbrev));
+}
+
+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)
 }
 
 static void describe(const char *arg, int last_one)


@@ -195,7 +197,12 @@ static void describe(const char *arg, int last_one)
 
        n = cmit->util;
        if (n) {
 
        n = cmit->util;
        if (n) {

+               /*
+                * Exact match to an existing ref.
+                */

                display_name(n);
                display_name(n);

+               if (longformat)
+                       show_suffix(0, n->tag->tagged->sha1);

                printf("\n");
                return;
        }
                printf("\n");
                return;
        }


@@ -281,8 +288,7 @@ static void describe(const char *arg, int last_one)
 
        display_name(all_matches[0].name);
        if (abbrev)
 
        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)
        printf("\n");
 
        if (!last_one)