Merge branch 'jl/fetch-submodule-recursive' into maint

diff --git a/builtin/config.c b/builtin/config.c
index 79fee767b88a2d826311afb7a3299d67dedd3b94..ca4a0db4a79241d7ded005483b4693967eea636f 100644 (file)
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -331,11 +331,10 @@ static int get_colorbool(int print)
                return get_colorbool_found ? 0 : 1;
 }
 
-int cmd_config(int argc, const char **argv, const char *unused_prefix)
+int cmd_config(int argc, const char **argv, const char *prefix)
 {
-       int nongit;
+       int nongit = !startup_info->have_repository;
        char *value;
-       const char *prefix = setup_git_directory_gently(&nongit);
 
        config_exclusive_filename = getenv(CONFIG_ENVIRONMENT);