diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-04-29 17:51:27 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-04-29 17:51:27 -0700 |
commit | 5fa8bf6bf9d20ccb37ed46ec7027a9ac64b2a2a7 (patch) | |
tree | 525bf6d5cec5b2cb0f36dcc578903fa06e380823 /t | |
parent | Merge branch 'pw/t5800-import-race-fix' (diff) | |
parent | config: expand tildes in include.path variable (diff) | |
download | tgif-5fa8bf6bf9d20ccb37ed46ec7027a9ac64b2a2a7.tar.xz |
Merge branch 'mm/include-userpath'
The new "include.path" directive in the configuration files learned
to understand "~/path" and "~user/path".
By Jeff King
* mm/include-userpath:
config: expand tildes in include.path variable
Diffstat (limited to 't')
-rwxr-xr-x | t/t1305-config-include.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t1305-config-include.sh b/t/t1305-config-include.sh index 4b1cbaa028..a70707620f 100755 --- a/t/t1305-config-include.sh +++ b/t/t1305-config-include.sh @@ -29,6 +29,14 @@ test_expect_success 'chained relative paths' ' test_cmp expect actual ' +test_expect_success 'include paths get tilde-expansion' ' + echo "[test]one = 1" >one && + echo "[include]path = ~/one" >.gitconfig && + echo 1 >expect && + git config test.one >actual && + test_cmp expect actual +' + test_expect_success 'include options can still be examined' ' echo "[test]one = 1" >one && echo "[include]path = one" >.gitconfig && |