git-describe: use tags found in packed-refs correctly
When your refs are packed, "git-describe" can find the tag that is the best match without ever parsing the tag itself. But lookup_tag() in display_name() says "I've never seen it", creates an empty shell, and returns it. We need to make sure that we actually have parsed the tag data into it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Mar 3, 2008 at 09:24 UTC
c374b91cf295f437d438a103bfd2cf3fffcce580
1 file changed
+1
-1
builtin-describe.c
+1
-1
@@ -156,7 +156,7 @@ static void display_name(struct commit_name *n)
156
{
157
if (n->prio == 2 && !n->tag) {
158
n->tag = lookup_tag(n->sha1);
159
- if (!n->tag || !n->tag->tag)
159
+ if (parse_tag(n->tag) || !n->tag || !n->tag->tag)
160
die("annotated tag %s not available", n->path);
161
if (strcmp(n->tag->tag, n->path))
162
warning("tag '%s' is really '%s' here", n->tag->tag, n->path);