From: Santiago Torres <santi...@nyu.edu>
This change is meant to prepare verify_tag for libification. Many
existing modules/commands already do the refname to sha1 resolution, so
should avoid resolving the refname twice. To avoid breaking
builtin/verify-tag, we move the refname resolution outside of the
verify_tag() call.
Signed-off-by: Santiago Torres <santi...@nyu.edu>
---
builtin/verify-tag.c | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c
index 1ca9a05..7a7c376 100644
--- a/builtin/verify-tag.c
+++ b/builtin/verify-tag.c
@@ -42,25 +42,23 @@ static int run_gpg_verify(const char *buf, unsigned long
size, unsigned flags)
return ret;
}
-static int verify_tag(const char *name, unsigned flags)
+static int verify_tag(const unsigned char *sha1, unsigned flags)
{
enum object_type type;
- unsigned char sha1[20];
char *buf;
+ char *hex_sha1;
unsigned long size;
int ret;
- if (get_sha1(name, sha1))
- return error("tag '%s' not found.", name);
-
+ hex_sha1 = sha1_to_hex(sha1);
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));
+ hex_sha1, typename(type));
buf = read_sha1_file(sha1, &type, &size);
if (!buf)
- return error("%s: unable to read file.", name);
+ return error("%s: unable to read file.", hex_sha1);
ret = run_gpg_verify(buf, size, flags);
@@ -80,6 +78,8 @@ 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 char *name;
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),
@@ -96,8 +96,15 @@ int cmd_verify_tag(int argc, const char **argv, const char
*prefix)
if (verbose)
flags |= GPG_VERIFY_VERBOSE;
- while (i < argc)
- if (verify_tag(argv[i++], flags))
+ while (i < argc) {
+ name = argv[i++];
+ if (get_sha1(name, sha1)) {
+ error("tag '%s' not found.", name);
had_error = 1;
+ continue;
+ }
+ if (verify_tag(sha1, flags))
+ had_error = 1;
+ }
return had_error;
}
--
2.8.0
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
