[PATCH v4 6/6] tag.c: Change gpg_verify_tag argument to sha1
From: <hidden>
Date: 2016-06-16 02:18:40
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Santiago Torres <redacted> The gpg_verify_tag function resolves the ref for any existing object. However, git tag -v resolves to only tag-refs. We can provide support for sha1 by moving the refname resolution code out of gpg_verify_tag and allow for the object's sha1 as an argument. Signed-off-by: Santiago Torres <redacted> --- builtin/tag.c | 2 +- builtin/verify-tag.c | 9 +++++++-- tag.c | 12 ++++-------- tag.h | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/builtin/tag.c b/builtin/tag.c
index f4450f8..398c892 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c@@ -104,7 +104,7 @@ static int delete_tag(const char *name, const char *ref, static int verify_tag(const char *name, const char *ref, const unsigned char *sha1) { - return gpg_verify_tag(name, GPG_VERIFY_VERBOSE); + return gpg_verify_tag(sha1, GPG_VERIFY_VERBOSE); } static int do_sign(struct strbuf *buffer)
diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c
index 7e36d53..2ff01d8 100644
--- a/builtin/verify-tag.c
+++ b/builtin/verify-tag.c@@ -30,6 +30,7 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix) { int i = 1, verbose = 0, had_error = 0; unsigned flags = 0; + unsigned char sha1[20]; const struct option verify_tag_options[] = { OPT__VERBOSE(&verbose, N_("print tag contents")), OPT_BIT(0, "raw", &flags, N_("print raw gpg status output"), GPG_VERIFY_RAW),
@@ -46,8 +47,12 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix) if (verbose) flags |= GPG_VERIFY_VERBOSE; - while (i < argc) - if (gpg_verify_tag(argv[i++], flags)) + while (i < argc) { + if (get_sha1(argv[i++], sha1)) + return error("tag '%s' not found.", argv[i]); + + if (gpg_verify_tag(sha1, flags)) had_error = 1; + } return had_error; }
diff --git a/tag.c b/tag.c
index f6443db..8ac9de5 100644
--- a/tag.c
+++ b/tag.c@@ -30,25 +30,21 @@ static int run_gpg_verify(const char *buf, unsigned long size, unsigned flags) return ret; } -int gpg_verify_tag(const char *name, unsigned flags) +int gpg_verify_tag(const unsigned char *sha1, unsigned flags) { enum object_type type; - unsigned char sha1[20]; char *buf; unsigned long size; int ret; - if (get_sha1(name, sha1)) - return error("tag '%s' not found.", name); - type = sha1_object_info(sha1, NULL); if (type != OBJ_TAG) - return error("%s: cannot verify a non-tag object of type %s.", - name, typename(type)); + return error("cannot verify a non-tag object of type %s.", + typename(type)); buf = read_sha1_file(sha1, &type, &size); if (!buf) - return error("%s: unable to read file.", name); + return error("unable to read file."); ret = run_gpg_verify(buf, size, flags);
diff --git a/tag.h b/tag.h
index 877f180..cb643b9 100644
--- a/tag.h
+++ b/tag.h@@ -17,6 +17,6 @@ extern int parse_tag_buffer(struct tag *item, const void *data, unsigned long si extern int parse_tag(struct tag *item); extern struct object *deref_tag(struct object *, const char *, int); extern struct object *deref_tag_noverify(struct object *); -extern int gpg_verify_tag(const char *name, unsigned flags); +extern int gpg_verify_tag(const unsigned char *sha1, unsigned flags); #endif /* TAG_H */
--
2.8.0