refs: print error message in debug output

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

diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c
index 5216191488e20115949418aab527988ba7b81e7c..e4f7810be208495e8883f3ca4abad3f21f320003 100644 (file)
--- a/fmt-merge-msg.c
+++ b/fmt-merge-msg.c
@@ -533,8 +533,9 @@ static void fmt_merge_msg_sigs(struct strbuf *out)
                else {
                        buf = payload.buf;
                        len = payload.len;
-                       if (check_signature(payload.buf, payload.len, sig.buf,
-                                           sig.len, &sigc) &&
+                       sigc.payload_type = SIGNATURE_PAYLOAD_TAG;
+                       sigc.payload = strbuf_detach(&payload, &sigc.payload_len);
+                       if (check_signature(&sigc, sig.buf, sig.len) &&
                            !sigc.output)
                                strbuf_addstr(&sig, "gpg verification failed.\n");
                        else