diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2017-05-16 08:28:46 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-17 01:32:26 (GMT) |
| commit | 0624c63ce6a488d3d8bccc4b1e79cc2093e2c4a4 (patch) | |
| tree | b78c1b9da859d05fad22c9ee4877bc050a727ee3 /t/t1305-config-include.sh | |
| parent | c9672ba4c86a5fb18ea20d1c4a2c0eb6a731f3cb (diff) | |
| download | git-0624c63ce6a488d3d8bccc4b1e79cc2093e2c4a4.zip git-0624c63ce6a488d3d8bccc4b1e79cc2093e2c4a4.tar.gz git-0624c63ce6a488d3d8bccc4b1e79cc2093e2c4a4.tar.bz2 | |
config: match both symlink & realpath versions in IncludeIf.gitdir:*
Change the conditional inclusion mechanism to support
e.g. gitdir:~/git_tree/repo where ~/git_tree is a symlink to
/mnt/stuff/repo.
This worked in the initial version of this facility[1], but regressed
later in the series while solving a related bug[2].
Now gitdir: will match against the symlinked
path (e.g. gitdir:~/git_tree/repo) in addition to the current
/mnt/stuff/repo path.
Since this is already in a release version note in the documentation
that this behavior changed, so users who expect their configuration to
work on both v2.13.0 and some future version of git with this fix
aren't utterly confused.
1. commit 3efd0bedc6 ("config: add conditional include", 2017-03-01)
2. commit 86f9515708 ("config: resolve symlinks in conditional
include's patterns", 2017-04-05)
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1305-config-include.sh')
| -rwxr-xr-x | t/t1305-config-include.sh | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/t/t1305-config-include.sh b/t/t1305-config-include.sh index 933915e..d9d2f54 100755 --- a/t/t1305-config-include.sh +++ b/t/t1305-config-include.sh @@ -273,6 +273,29 @@ test_expect_success SYMLINKS 'conditional include, relative path with symlinks' ) ' +test_expect_success SYMLINKS 'conditional include, gitdir matching symlink' ' + ln -s foo bar && + ( + cd bar && + echo "[includeIf \"gitdir:bar/\"]path=bar7" >>.git/config && + echo "[test]seven=7" >.git/bar7 && + echo 7 >expect && + git config test.seven >actual && + test_cmp expect actual + ) +' + +test_expect_success SYMLINKS 'conditional include, gitdir matching symlink, icase' ' + ( + cd bar && + echo "[includeIf \"gitdir/i:BAR/\"]path=bar8" >>.git/config && + echo "[test]eight=8" >.git/bar8 && + echo 8 >expect && + git config test.eight >actual && + test_cmp expect actual + ) +' + test_expect_success 'include cycles are detected' ' cat >.gitconfig <<-\EOF && [test]value = gitconfig |