mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-04 16:27:54 +01:00
Code Activity

Merge branch 'jk/missing-config'

Browse source 
* jk/missing-config:
  config: treat non-existent config files as empty
This commit is contained in:
Junio C Hamano 2010-11-17 15:02:08 -08:00
commit 6f49ed6153
2 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config.c
View file

@ -871,9 +871,7 @@ int git_config(config_fn_t fn, void *data)
if (config_parameters)
found += 1;
if (found == 0)
return -1;
return ret;
return ret == 0 ? found : ret;
}
/*

29
t/t1300-repo-config.sh
View file

@ -288,6 +288,14 @@ EOF
test_expect_success 'working --list' \
'git config --list > output && cmp output expect'
cat > expect << EOF
EOF
test_expect_success '--list without repo produces empty output' '
git --git-dir=nonexistent config --list >output &&
test_cmp expect output
'
cat > expect << EOF
beta.noindent sillyValue
nextsection.nonewline wow2 for me
@ -836,6 +844,27 @@ test_expect_success SYMLINKS 'symlinked configuration' '
'
test_expect_success 'nonexistent configuration' '
(
GIT_CONFIG=doesnotexist &&
export GIT_CONFIG &&
test_must_fail git config --list &&
test_must_fail git config test.xyzzy
)
'
test_expect_success SYMLINKS 'symlink to nonexistent configuration' '
ln -s doesnotexist linktonada &&
ln -s linktonada linktolinktonada &&
(
GIT_CONFIG=linktonada &&
export GIT_CONFIG &&
test_must_fail git config --list &&
GIT_CONFIG=linktolinktonada &&
test_must_fail git config --list
)
'
test_expect_success 'check split_cmdline return' "
git config alias.split-cmdline-fix 'echo \"' &&
test_must_fail git split-cmdline-fix &&