diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-05-30 11:16:43 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-05-30 11:16:44 +0900 |
commit | b784d0be5dc05f2146c1505d1adf637edba4b1bb (patch) | |
tree | 543ec519f90dc41e9825c079e11d072b3dddcaa7 /csum-file.c | |
parent | Merge branch 'jt/fetch-allow-tip-sha1-implicitly' (diff) | |
parent | config: match both symlink & realpath versions in IncludeIf.gitdir:* (diff) | |
download | tgif-b784d0be5dc05f2146c1505d1adf637edba4b1bb.tar.xz |
Merge branch 'ab/conditional-config-with-symlinks'
The recently introduced "[includeIf "gitdir:$dir"] path=..."
mechansim has further been taught to take symlinks into account.
The directory "$dir" specified in "gitdir:$dir" may be a symlink to
a real location, not something that $(getcwd) may return. In such
a case, a realpath of "$dir" is compared with the real path of the
current repository to determine if the contents from the named path
should be included.
* ab/conditional-config-with-symlinks:
config: match both symlink & realpath versions in IncludeIf.gitdir:*
Diffstat (limited to 'csum-file.c')
0 files changed, 0 insertions, 0 deletions