undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

describe: re-fix display_name()

Browse Source 
It is implausible for lookup_tag() to return NULL in this particular
codepath but we should protect ourselves against a broken repository
better.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2008-03-03 15:54:23 -08:00
parent 870cf7d698
commit 3167d72565
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-describe.c
View File

@ -156,7 +156,7 @@ static void display_name(struct commit_name *n)
{ {
if (n->prio == 2 && !n->tag) { if (n->prio == 2 && !n->tag) {
n->tag = lookup_tag(n->sha1); n->tag = lookup_tag(n->sha1);
if (parse_tag(n->tag) || !n->tag || !n->tag->tag) if (!n->tag || parse_tag(n->tag) || !n->tag->tag)
die("annotated tag %s not available", n->path); die("annotated tag %s not available", n->path);
if (strcmp(n->tag->tag, n->path)) if (strcmp(n->tag->tag, n->path))
warning("tag '%s' is really '%s' here", n->tag->tag, n->path); warning("tag '%s' is really '%s' here", n->tag->tag, n->path);