Merge branch 'jc/same-encoding' into maint

diff --git a/builtin/commit.c b/builtin/commit.c
index 4d50484837ece50276ca7a09239815dcca5b5f7d..a17a5df4494e9414bd4b04fd008671d84d914ca0 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1419,6 +1419,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
                usage_with_options(builtin_commit_usage, builtin_commit_options);
 
        wt_status_prepare(&s);
+       gitmodules_config();
        git_config(git_commit_config, &s);
        determine_whence(&s);
        s.colopts = 0;