diff options
| author |  René Scharfe <l.s.r@web.de> | 2019-09-05 21:59:42 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-09-05 14:11:34 -0700 |
| commit | c77722b3ea42a87381915f1203648a5f5d86c1ff (patch) | |
| tree | 44b3e742d69e5e3334b5865ae1237cc9c045f258 /builtin/log.c | |
| parent | tag: factor out get_tagged_oid() (diff) | |
| download | tgif-c77722b3ea42a87381915f1203648a5f5d86c1ff.tar.xz | |
use get_tagged_oid()
Avoid derefencing ->tagged without checking for NULL by using the
convenience wrapper for getting the ID of the tagged object. It die()s
when encountering a broken tag instead of segfaulting.
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/log.c')
| -rw-r--r-- | builtin/log.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/log.c b/builtin/log.c index 44b10b3415..c4b35fdaf9 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -627,6 +627,7 @@ int cmd_show(int argc, const char **argv, const char *prefix) break; case OBJ_TAG: { struct tag *t = (struct tag *)o; + struct object_id *oid = get_tagged_oid(t); if (rev.shown_one) putchar('\n'); @@ -638,10 +639,10 @@ int cmd_show(int argc, const char **argv, const char *prefix) rev.shown_one = 1; if (ret) break; - o = parse_object(the_repository, &t->tagged->oid); + o = parse_object(the_repository, oid); if (!o) ret = error(_("could not read object %s"), - oid_to_hex(&t->tagged->oid)); + oid_to_hex(oid)); objects[i].item = o; i--; break; |