diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-03 15:54:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-03 15:54:23 -0800 |
| commit | 3167d7256505cdeace5293bc67f0d16657a9277e (patch) | |
| tree | b4d223f8d8ebf4bdd36a769e7957b8b8cde40880 | |
| parent | 870cf7d69872ebc925989b400fb4e7031870db5f (diff) | |
| download | git-3167d7256505cdeace5293bc67f0d16657a9277e.tar.gz git-3167d7256505cdeace5293bc67f0d16657a9277e.tar.xz | |
describe: re-fix display_name()
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>
| -rw-r--r-- | builtin-describe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-describe.c b/builtin-describe.c index 43be67182..7a5ab012b 100644 --- a/builtin-describe.c +++ b/builtin-describe.c @@ -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 (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); if (strcmp(n->tag->tag, n->path)) warning("tag '%s' is really '%s' here", n->tag->tag, n->path); |