Merge branch 'maint'

diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index db76d9f3a8dd246ff2287c02ea15e7073730e8f6..1c040708696c8d6e81023b3261966fa751f14ad4 100644 (file)
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -492,7 +492,7 @@ 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)) {
+               else if (verify_signed_buffer(buf, len, buf + len, size - len, &sig, NULL)) {
                        if (!sig.len)
                                strbuf_addstr(&sig, "gpg verification failed.\n");
                }