From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 30 May 2017 02:16:43 +0000 (+0900)
Subject: Merge branch 'ab/conditional-config-with-symlinks'
X-Git-Tag: v2.14.0-rc0~140
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b784d0be5dc05f2146c1505d1adf637edba4b1bb;p=thirdparty%2Fgit.git

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:*
---

b784d0be5dc05f2146c1505d1adf637edba4b1bb