Sync with maint

[thirdparty/git.git] / builtin / fmt-merge-msg.c

diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index 736f666f644c7cf78b816888ba226693464fc331..05a92c59d8886bd9a6a5d6361693c1410914fe5a 100644 (file)
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -494,6 +494,7 @@ static void fmt_merge_msg_sigs(struct strbuf *out)
                enum object_type type;
                unsigned long size, len;
                char *buf = read_object_file(oid, &type, &size);
+               struct signature_check sigc = { 0 };
                struct strbuf sig = STRBUF_INIT;
 
                if (!buf || type != OBJ_TAG)
@@ -502,10 +503,12 @@ static void fmt_merge_msg_sigs(struct strbuf *out)
 
                if (size == len)
                        ; /* merely annotated */
-               else if (verify_signed_buffer(buf, len, buf + len, size - len, &sig, NULL)) {
-                       if (!sig.len)
-                               strbuf_addstr(&sig, "gpg verification failed.\n");
-               }
+               else if (!check_signature(buf, len, buf + len, size - len,
+                                         &sigc)) {
+                       strbuf_addstr(&sig, sigc.gpg_output);
+                       signature_check_clear(&sigc);
+               } else
+                       strbuf_addstr(&sig, "gpg verification failed.\n");
 
                if (!tag_number++) {
                        fmt_tag_signature(&tagbuf, &sig, buf, len);