diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-09-30 13:19:29 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-30 13:19:29 +0900 |
| commit | cf861cd7a018481e8323444d29fe9e6b73c19a06 (patch) | |
| tree | 854763ac66980d68f83300660e4a88a5c0cc2d23 /builtin/log.c | |
| parent | Merge branch 'en/filter-branch-deprecation' (diff) | |
| parent | use get_tagged_oid() (diff) | |
| download | tgif-cf861cd7a018481e8323444d29fe9e6b73c19a06.tar.xz | |
Merge branch 'rs/get-tagged-oid'
Code cleanup.
* rs/get-tagged-oid:
use get_tagged_oid()
tag: factor out get_tagged_oid()
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; |