Merge branch 'sb/misc-cleanups'

diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c
index a3d3a438268a19507b42d42cdb9acf7eaa69ad5a..99f8148cf79bac1d636bfe35a93282f3da2ebfd7 100644 (file)
--- a/builtin/verify-tag.c
+++ b/builtin/verify-tag.c
@@ -18,59 +18,6 @@ static const char * const verify_tag_usage[] = {
                NULL
 };
 
-static int run_gpg_verify(const char *buf, unsigned long size, unsigned flags)
-{
-       struct signature_check sigc;
-       size_t payload_size;
-       int ret;
-
-       memset(&sigc, 0, sizeof(sigc));
-
-       payload_size = parse_signature(buf, size);
-
-       if (size == payload_size) {
-               if (flags & GPG_VERIFY_VERBOSE)
-                       write_in_full(1, buf, payload_size);
-               return error("no signature found");
-       }
-
-       ret = check_signature(buf, payload_size, buf + payload_size,
-                               size - payload_size, &sigc);
-       print_signature_buffer(&sigc, flags);
-
-       signature_check_clear(&sigc);
-       return ret;
-}
-
-static int verify_tag(const unsigned char *sha1, const char *name_to_report,
-                       unsigned flags)
-{
-       enum object_type type;
-       char *buf;
-       unsigned long size;
-       int ret;
-
-       type = sha1_object_info(sha1, NULL);
-       if (type != OBJ_TAG)
-               return error("%s: cannot verify a non-tag object of type %s.",
-                               name_to_report ?
-                               name_to_report :
-                               find_unique_abbrev(sha1, DEFAULT_ABBREV),
-                               typename(type));
-
-       buf = read_sha1_file(sha1, &type, &size);
-       if (!buf)
-               return error("%s: unable to read file.",
-                               name_to_report ?
-                               name_to_report :
-                               find_unique_abbrev(sha1, DEFAULT_ABBREV));
-
-       ret = run_gpg_verify(buf, size, flags);
-
-       free(buf);
-       return ret;
-}
-
 static int git_verify_tag_config(const char *var, const char *value, void *cb)
 {
        int status = git_gpg_config(var, value, cb);
@@ -104,7 +51,7 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix)
                const char *name = argv[i++];
                if (get_sha1(name, sha1))
                        had_error = !!error("tag '%s' not found.", name);
-               else if (verify_tag(sha1, name, flags))
+               else if (gpg_verify_tag(sha1, name, flags))
                        had_error = 1;
        }
        return had_error;