diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-01-27 14:56:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-27 14:56:25 -0800 |
| commit | f1694b62bb3a3e1766b92d64a38f61524cc730a0 (patch) | |
| tree | c88a5c4870bc8fec37ba9d2b29ff8a01c2f4eb84 /t/t1300-repo-config.sh | |
| parent | transport_get(): drop unnecessary check for !remote (diff) | |
| parent | builtin-config: Fix crash when using "-f <relative path>" from non-root dir (diff) | |
| download | tgif-f1694b62bb3a3e1766b92d64a38f61524cc730a0.tar.xz | |
Merge branch 'jh/maint-config-file-prefix'
* jh/maint-config-file-prefix:
builtin-config: Fix crash when using "-f <relative path>" from non-root dir
Diffstat (limited to 't/t1300-repo-config.sh')
| -rwxr-xr-x | t/t1300-repo-config.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh index f89d7e9e49..f11f98c3ce 100755 --- a/t/t1300-repo-config.sh +++ b/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)' \ '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 cat > expect << EOF |