Merge branch 'js/config-set-in-non-repository' into maint

diff --git a/builtin/config.c b/builtin/config.c
index c26d6e7fdd5d2896850ac909cb9ce04960520b0d..746233e4bbaffc6d7f2d4d1849bd89cd13286d02 100644 (file)
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -352,6 +352,9 @@ static int get_colorbool(const char *var, int print)
 
 static void check_write(void)
 {
+       if (!given_config_source.file && !startup_info->have_repository)
+               die("not in a git directory");
+
        if (given_config_source.use_stdin)
                die("writing to stdin is not supported");