Merge branch 'jc/gpg-lazy-init'

[thirdparty/git.git] / builtin / merge.c

diff --git a/builtin/merge.c b/builtin/merge.c
index 7347b738e501f61e9662a804a3a9ac70a765cbfd..19c31d4ff488335e5c2e5717fb8649589f72f0bb 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -661,9 +661,6 @@ static int git_merge_config(const char *k, const char *v, void *cb)
        }
 
        status = fmt_merge_msg_config(k, v, cb);
-       if (status)
-               return status;
-       status = git_gpg_config(k, v, NULL);
        if (status)
                return status;
        return git_diff_ui_config(k, v, cb);