Skip to contentSkip to conversation

Paper bag fix git-describe on packed tags

PATCH In review Shawn O. Pearce 1 participant 2 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Paper bag fix git-describe on packed tags

In 212945d ("Teach git-describe to verify annotated tag names") we tried to access a possibly unparsed tag structure. We must make sure it was parsed before we try to read its tag name.

---

As 212945d is already in master this probably should be fast-tracked there. Whoops. :-)

 builtin-describe.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
builtin-describe.c +1 -1
index 2f1e7ba..d4204ee 100644
@@ -156,7 +156,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);
Signature · 1 line
1.5.4.3.509.gf785
#1 lore raw
Quoted 9 lines · Shawn O. Pearce

In 212945d ("Teach git-describe to verify annotated tag names") we tried to access a possibly unparsed tag structure. We must make sure it was parsed before we try to read its tag name.

---

As 212945d is already in master this probably should be fast-tracked there. Whoops. :-)

Hmmph, looks like you already fixed this with c374b91cf295f437d438a103bfd2cf3fffcce580 ("git-describe: use tags found in packed-refs correctly").

Signature · 1 line
Shawn.