aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-02-10 13:02:05 -0800
committerJunio C Hamano <gitster@pobox.com>2010-02-10 13:02:05 -0800
commitb0e67fffb42059cc5dca6f58c376a2ffc5fb4520 (patch)
tree4008cbd4d131ffc0fc8105161f593a35f7a7691d /t
parent2e9d7330aaadd06d828da52f73eeda7106ba4cb4 (diff)
parent65807ee697a28cb30b8ad38ebb8b84cebd3f255d (diff)
downloadgit-b0e67fffb42059cc5dca6f58c376a2ffc5fb4520.tar.gz
git-b0e67fffb42059cc5dca6f58c376a2ffc5fb4520.tar.xz
Merge branch 'jh/maint-config-file-prefix' into maint
* jh/maint-config-file-prefix: builtin-config: Fix crash when using "-f <relative path>" from non-root dir
Diffstat (limited to 't')
-rwxr-xr-xt/t1300-repo-config.sh11
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index 83b729401..9e74b1f14 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