diff options
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2017-05-16 08:28:46 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-05-17 10:32:26 +0900 |
commit | 0624c63ce6a488d3d8bccc4b1e79cc2093e2c4a4 (patch) | |
tree | b78c1b9da859d05fad22c9ee4877bc050a727ee3 /git-gui | |
parent | Merge branch 'nd/conditional-config-in-early-config' (diff) | |
download | tgif-0624c63ce6a488d3d8bccc4b1e79cc2093e2c4a4.tar.xz |
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 'git-gui')
0 files changed, 0 insertions, 0 deletions