diff options
| author |  Stefan Beller <sbeller@google.com> | 2017-07-12 17:44:15 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-07-13 12:02:48 -0700 |
| commit | 84571760ca96d244e4fff06819fab119947d792e (patch) | |
| tree | 1f0c00d46652b0e5f503a1dbbbf49132c158e9da /builtin | |
| parent | commit: convert lookup_commit_graft to struct object_id (diff) | |
| download | tgif-84571760ca96d244e4fff06819fab119947d792e.tar.xz | |
tag: convert gpg_verify_tag to use struct object_id
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/tag.c | 2 | ||||
| -rw-r--r-- | builtin/verify-tag.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/builtin/tag.c b/builtin/tag.c index 01154ea8dc..b25bf8daa2 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -111,7 +111,7 @@ static int verify_tag(const char *name, const char *ref, if (fmt_pretty) flags = GPG_VERIFY_OMIT_STATUS; - if (gpg_verify_tag(oid->hash, name, flags)) + if (gpg_verify_tag(oid, name, flags)) return -1; if (fmt_pretty) diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c index f9a5f7535a..ed8329340f 100644 --- a/builtin/verify-tag.c +++ b/builtin/verify-tag.c @@ -56,20 +56,21 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix) } while (i < argc) { - unsigned char sha1[20]; + struct object_id oid; const char *name = argv[i++]; - if (get_sha1(name, sha1)) { + + if (get_oid(name, &oid)) { had_error = !!error("tag '%s' not found.", name); continue; } - if (gpg_verify_tag(sha1, name, flags)) { + if (gpg_verify_tag(&oid, name, flags)) { had_error = 1; continue; } if (fmt_pretty) - pretty_print_ref(name, sha1, fmt_pretty); + pretty_print_ref(name, oid.hash, fmt_pretty); } return had_error; } |