diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-04-30 00:51:27 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-04-30 00:51:27 (GMT) |
commit | 5fa8bf6bf9d20ccb37ed46ec7027a9ac64b2a2a7 (patch) | |
tree | 525bf6d5cec5b2cb0f36dcc578903fa06e380823 /t | |
parent | f61977ff8d1a420573e99a8a88df479c37f70162 (diff) | |
parent | 4c0a89fcde219df8db8fdb9635ef2ef40d002a6e (diff) | |
download | git-5fa8bf6bf9d20ccb37ed46ec7027a9ac64b2a2a7.zip git-5fa8bf6bf9d20ccb37ed46ec7027a9ac64b2a2a7.tar.gz git-5fa8bf6bf9d20ccb37ed46ec7027a9ac64b2a2a7.tar.bz2 |
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 4b1cbaa..a707076 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 && |