diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-05-30 05:16:43 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-30 05:16:44 +0300 |
| commit | b784d0be5dc05f2146c1505d1adf637edba4b1bb (patch) | |
| tree | 543ec519f90dc41e9825c079e11d072b3dddcaa7 /Documentation | |
| parent | 02c531eba2925d89856baca8dc6a9d1b31bc4d7f (diff) | |
| parent | 0624c63ce6a488d3d8bccc4b1e79cc2093e2c4a4 (diff) | |
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 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 0ea247bdca..43d830ee3b 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -145,6 +145,16 @@ A few more notes on matching via `gitdir` and `gitdir/i`: * Symlinks in `$GIT_DIR` are not resolved before matching. + * Both the symlink & realpath versions of paths will be matched + outside of `$GIT_DIR`. E.g. if ~/git is a symlink to + /mnt/storage/git, both `gitdir:~/git` and `gitdir:/mnt/storage/git` + will match. ++ +This was not the case in the initial release of this feature in +v2.13.0, which only matched the realpath version. Configuration that +wants to be compatible with the initial release of this feature needs +to either specify only the realpath version, or both versions. + * Note that "../" is not special and will match literally, which is unlikely what you want. |