Browse Source

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
maint
Junio C Hamano 9 years ago
parent
commit
0e58b47d15
  1. 3
      builtin/config.c
  2. 11
      t/t1308-config-set.sh

3
builtin/config.c

@ -352,6 +352,9 @@ static int get_colorbool(const char *var, int print) @@ -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");


11
t/t1308-config-set.sh

@ -218,4 +218,15 @@ test_expect_success 'check line errors for malformed values' ' @@ -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

Loading…
Cancel
Save