test-ref-store: remove force-create argument for create-reflog

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

diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c
index b969dc6ebb6800addbafe72adcfbabdadb6af121..5216191488e20115949418aab527988ba7b81e7c 100644 (file)
--- a/fmt-merge-msg.c
+++ b/fmt-merge-msg.c
@@ -9,6 +9,7 @@
 #include "branch.h"
 #include "fmt-merge-msg.h"
 #include "commit-reach.h"
+#include "gpg-interface.h"
 
 static int use_branch_desc;
 static int suppress_dest_pattern_seen;
@@ -16,6 +17,8 @@ static struct string_list suppress_dest_patterns = STRING_LIST_INIT_DUP;
 
 int fmt_merge_msg_config(const char *key, const char *value, void *cb)
 {
+       int status = 0;
+
        if (!strcmp(key, "merge.log") || !strcmp(key, "merge.summary")) {
                int is_bool;
                merge_log_config = git_config_bool_or_int(key, value, &is_bool);
@@ -34,6 +37,9 @@ int fmt_merge_msg_config(const char *key, const char *value, void *cb)
                        string_list_append(&suppress_dest_patterns, value);
                suppress_dest_pattern_seen = 1;
        } else {
+               status = git_gpg_config(key, value, NULL);
+               if (status)
+                       return status;
                return git_default_config(key, value, cb);
        }
        return 0;
@@ -528,11 +534,11 @@ static void fmt_merge_msg_sigs(struct strbuf *out)
                        buf = payload.buf;
                        len = payload.len;
                        if (check_signature(payload.buf, payload.len, sig.buf,
-                                        sig.len, &sigc) &&
-                               !sigc.gpg_output)
+                                           sig.len, &sigc) &&
+                           !sigc.output)
                                strbuf_addstr(&sig, "gpg verification failed.\n");
                        else
-                               strbuf_addstr(&sig, sigc.gpg_output);
+                               strbuf_addstr(&sig, sigc.output);
                }
                signature_check_clear(&sigc);