summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-03-10 11:13:45 -0800
committerJunio C Hamano <gitster@pobox.com>2016-03-10 11:13:45 -0800
commit0e58b47d153a90d80518ef35c53ffb244ed4ecd6 (patch)
treef2bff1f66597e84bdd91a0ecd50b094d06cd387d
parent1191d606bb2b544e3d8429d07f8ff43aae7d8145 (diff)
parent638fa623d5b5fb392a062edf61ccf086d35ab26b (diff)
downloadgit-0e58b47d153a90d80518ef35c53ffb244ed4ecd6.tar.gz
Merge branch 'js/config-set-in-non-repository' into maint
"git config section.var value" to set a value in per-repository configuration file failed when it was run outside any repository, but didn't say the reason correctly. * js/config-set-in-non-repository: git config: report when trying to modify a non-existing repo config
-rw-r--r--builtin/config.c3
-rwxr-xr-xt/t1308-config-set.sh11
2 files changed, 14 insertions, 0 deletions
diff --git a/builtin/config.c b/builtin/config.c
index c26d6e7fdd..746233e4bb 100644
--- 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");
diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh
index 91235b76ba..9863d0d0ed 100755
--- 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_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