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>

diff --git a/builtin/tag.c b/builtin/tag.c
index 01154ea8dcca869ed635eb433d5afe879b8e883c..b25bf8daa289d75af023fd5f14034eccdb2a9d37 100644 (file)
--- 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 (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)
                return -1;
 
        if (fmt_pretty)

diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c
index f9a5f7535aad9c24041e0677dfa4ed4af87cabf0..ed8329340f73482c18b295a2733fcb11c4198859 100644 (file)
--- 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) {
        }
 
        while (i < argc) {

-               unsigned char sha1[20];
+               struct object_id oid;

                const char *name = argv[i++];
                const char *name = argv[i++];

-               if (get_sha1(name, sha1)) {
+
+               if (get_oid(name, &oid)) {

                        had_error = !!error("tag '%s' not found.", name);
                        continue;
                }
 
                        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)
                        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;
 }
        }
        return had_error;
 }

diff --git a/tag.c b/tag.c
index 47f60ae151c2cfd9855d1b6f1660ec2ba178bec3..7e10acfb6ef1673e783e0a42e1b8810a6e2eff06 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -33,7 +33,7 @@ static int run_gpg_verify(const char *buf, unsigned long size, unsigned flags)
        return ret;
 }
 
        return ret;
 }
 

-int gpg_verify_tag(const unsigned char *sha1, const char *name_to_report,
+int gpg_verify_tag(const struct object_id *oid, const char *name_to_report,

                unsigned flags)
 {
        enum object_type type;
                unsigned flags)
 {
        enum object_type type;


@@ -41,20 +41,20 @@ int gpg_verify_tag(const unsigned char *sha1, const char *name_to_report,
        unsigned long size;
        int ret;
 
        unsigned long size;
        int ret;
 

-       type = sha1_object_info(sha1, NULL);
+       type = sha1_object_info(oid->hash, NULL);

        if (type != OBJ_TAG)
                return error("%s: cannot verify a non-tag object of type %s.",
                                name_to_report ?
                                name_to_report :
        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),
+                               find_unique_abbrev(oid->hash, DEFAULT_ABBREV),

                                typename(type));
 
                                typename(type));
 

-       buf = read_sha1_file(sha1, &type, &size);
+       buf = read_sha1_file(oid->hash, &type, &size);

        if (!buf)
                return error("%s: unable to read file.",
                                name_to_report ?
                                name_to_report :
        if (!buf)
                return error("%s: unable to read file.",
                                name_to_report ?
                                name_to_report :

-                               find_unique_abbrev(sha1, DEFAULT_ABBREV));
+                               find_unique_abbrev(oid->hash, DEFAULT_ABBREV));

 
        ret = run_gpg_verify(buf, size, flags);
 
 
        ret = run_gpg_verify(buf, size, flags);
 

diff --git a/tag.h b/tag.h
index fdfcb4a84aa16b8173f8f308f7faecf8e9f000c7..d469534e82a87b651abe752469d0547c2b560e10 100644 (file)
--- a/tag.h
+++ b/tag.h
@@ -17,7 +17,7 @@ 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 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 unsigned char *sha1,
+extern int gpg_verify_tag(const struct object_id *oid,

                const char *name_to_report, unsigned flags);
 
 #endif /* TAG_H */
                const char *name_to_report, unsigned flags);
 
 #endif /* TAG_H */