Merge branch 'bs/stdio-undef-before-redef'

diff --git a/builtin/commit.c b/builtin/commit.c
index 26b2986abe679b594798748b4776917050b1bd4d..824be655857bf4fa5b1992054ef1f8948835df85 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1406,6 +1406,10 @@ static int git_commit_config(const char *k, const char *v, void *cb)
        }
        if (!strcmp(k, "commit.cleanup"))
                return git_config_string(&cleanup_arg, k, v);
+       if (!strcmp(k, "commit.gpgsign")) {
+               sign_commit = git_config_bool(k, v) ? "" : NULL;
+               return 0;
+       }
 
        status = git_gpg_config(k, v, NULL);
        if (status)