[PATCH 4/6] tag: add format specifier to gpg_verify_tag

[santiago]

From: Lukas P <luk.puehrin...@gmail.com>

Calling functions for gpg_verify_tag() may desire to print relevant
information about the header for further verification. Add an optional
format argument to print any desired information after GPG verification.

Signed-off-by: Lukas Puehringer <lukas.puehrin...@nyu.edu>
---
 builtin/tag.c        |  2 +-
 builtin/verify-tag.c |  6 ++++--
 tag.c                | 14 ++++++++++++--
 tag.h                |  4 ++--
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/builtin/tag.c b/builtin/tag.c
index dbf271f..94ed8a2 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -106,7 +106,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(sha1, name, GPG_VERIFY_VERBOSE);
+       return verify_and_format_tag(sha1, name, NULL, GPG_VERIFY_VERBOSE);
 }
 
 static int do_sign(struct strbuf *buffer)
diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c
index 99f8148..7a1121b 100644
--- a/builtin/verify-tag.c
+++ b/builtin/verify-tag.c
@@ -51,8 +51,10 @@ 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 (gpg_verify_tag(sha1, name, flags))
-                       had_error = 1;
+               else {
+                       if (verify_and_format_tag(sha1, name, NULL, flags))
+                               had_error = 1;
+               }
        }
        return had_error;
 }
diff --git a/tag.c b/tag.c
index d1dcd18..e08da51 100644
--- a/tag.c
+++ b/tag.c
@@ -3,6 +3,7 @@
 #include "commit.h"
 #include "tree.h"
 #include "blob.h"
+#include "ref-filter.h"
 
 const char *tag_type = "tag";
 
@@ -30,8 +31,8 @@ static int run_gpg_verify(const char *buf, unsigned long 
size, unsigned flags)
        return ret;
 }
 
-int gpg_verify_tag(const unsigned char *sha1, const char *name_to_report,
-               unsigned flags)
+int verify_and_format_tag(const unsigned char *sha1, const char 
*name_to_report,
+               const char *fmt_pretty, unsigned flags)
 {
        enum object_type type;
        char *buf;
@@ -56,6 +57,15 @@ int gpg_verify_tag(const unsigned char *sha1, const char 
*name_to_report,
        ret = run_gpg_verify(buf, size, flags);
 
        free(buf);
+
+       if (fmt_pretty) {
+               struct ref_array_item *ref_item;
+               ref_item = new_ref_item(name_to_report, sha1, 0);
+               ref_item->kind = FILTER_REFS_TAGS;
+               show_ref_item(ref_item, fmt_pretty, 0);
+               free_ref_item(ref_item);
+       }
+
        return ret;
 }
 
diff --git a/tag.h b/tag.h
index a5721b6..460b6f9 100644
--- 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 gpg_verify_tag(const unsigned char *sha1,
-               const char *name_to_report, unsigned flags);
+extern int verify_and_format_tag(const unsigned char *sha1,
+               const char *name_to_report, const char *fmt_pretty, unsigned 
flags);
 
 #endif /* TAG_H */
-- 
2.10.0