diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-05-10 10:33:05 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-05-10 10:33:05 -0700 |
commit | db8d6646786a9aa3242dc9eafbcef2e9f77ba7ab (patch) | |
tree | 17a6a3a49f7b4fd5678b8f382747880ce49d0a20 /t | |
parent | 5939c6975aecf57c4d3f073546235253f690c297 (diff) | |
parent | 4c0a89fcde219df8db8fdb9635ef2ef40d002a6e (diff) | |
download | git-db8d6646786a9aa3242dc9eafbcef2e9f77ba7ab.tar.gz git-db8d6646786a9aa3242dc9eafbcef2e9f77ba7ab.tar.xz |
Merge branch 'mm/include-userpath' into maint
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 4b1cbaa02..a70707620 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 && |