Without this the output is:
$ git describe --long origin/next
v1.5.4.3-0-g31e0b2c-500-g83a2cbb
It was introduced in the conflicting part of
b00ac8c (Merge branch 'sp/describe-tag')
Signed-off-by: Santi Béjar <sbejar@xxxxxxxxx>
---
builtin-describe.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin-describe.c b/builtin-describe.c
index 2f1e7ba..7ba822a 100644
--- a/builtin-describe.c
+++ b/builtin-describe.c
@@ -166,9 +166,6 @@ static void display_name(struct commit_name *n)
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 describe(const char *arg, int last_one)
@@ -196,6 +193,9 @@ static void describe(const char *arg, int last_one)
n = cmit->util;
if (n) {
display_name(n);
+ if (longformat)
+ printf("-0-g%s",
+ find_unique_abbrev(n->tag->tagged->sha1, abbrev));
printf("\n");
return;
}
--
1.5.4.3.488.g7b3a6
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
