undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jh/maint-config-file-prefix' into maint

Browse Source 
* jh/maint-config-file-prefix:
  builtin-config: Fix crash when using "-f <relative path>" from non-root dir
This commit is contained in:
Junio C Hamano 2010-02-10 13:02:05 -08:00
commit b0e67fffb4
2 changed files with 12 additions and 1 deletions

2
builtin-config.c

@ -340,7 +340,7 @@ int cmd_config(int argc, const char **argv, const char *unused_prefix)
if (!is_absolute_path(given_config_file) && prefix) if (!is_absolute_path(given_config_file) && prefix)
config_exclusive_filename = prefix_filename(prefix, config_exclusive_filename = prefix_filename(prefix,
strlen(prefix), strlen(prefix),
argv[2]); given_config_file);
else else
config_exclusive_filename = given_config_file; config_exclusive_filename = given_config_file;
} }

11
t/t1300-repo-config.sh

@ -398,6 +398,17 @@ test_expect_success 'alternative GIT_CONFIG' 'cmp output expect'
test_expect_success 'alternative GIT_CONFIG (--file)' \ test_expect_success 'alternative GIT_CONFIG (--file)' \
'git config --file other-config -l > output && cmp output expect' 'git config --file other-config -l > output && cmp output expect'
test_expect_success 'refer config from subdirectory' '
mkdir x &&
(
cd x &&
echo strasse >expect
git config --get --file ../other-config ein.bahn >actual &&
test_cmp expect actual
)
'
GIT_CONFIG=other-config git config anwohner.park ausweis GIT_CONFIG=other-config git config anwohner.park ausweis
cat > expect << EOF cat > expect << EOF