git config: report when trying to modify a non-existing repo config

It is a pilot error to call `git config section.key value` outside of
any Git worktree. The message

error: could not lock config file .git/config: No such file or
directory

is not very helpful in that situation, though. Let's print a helpful
message instead.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/config.c b/builtin/config.c
index adc772786a7ddf9952aaccb7578b57d10396da93..78aab956ad2a4c2192a79381b346a62e160c328e 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)
 {
 
 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");
 
        if (given_config_source.use_stdin)
                die("writing to stdin is not supported");
 

diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh
index 91235b76ba76f7e7e9338e37da7106eb550969e6..9863d0d0ed7e07457f5f541897ac3959df9c9aa7 100755 (executable)
--- a/t/t1308-config-set.sh
+++ b/t/t1308-config-set.sh
@@ -218,4 +218,15 @@ test_expect_success 'check line errors for malformed values' '
        test_i18ngrep "fatal: .*alias\.br.*\.git/config.*line 2" result
 '
 
        test_i18ngrep "fatal: .*alias\.br.*\.git/config.*line 2" result
 '
 

+test_expect_success 'error on modifying repo config without repo' '
+       mkdir no-repo &&
+       (
+               GIT_CEILING_DIRECTORIES=$(pwd) &&
+               export GIT_CEILING_DIRECTORIES &&
+               cd no-repo &&
+               test_must_fail git config a.b c 2>err &&
+               grep "not in a git directory" err
+       )
+'
+

 test_done
 test_done