diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-04-24 08:07:46 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-24 08:07:46 +0300 |
| commit | a2e2c046833be53e7599ee7fed5c45f16580ab37 (patch) | |
| tree | 0ea4faab2f6b99ac0cbbfebdd1e4f35ac7eff622 /builtin/config.c | |
| parent | 4c01f67d9102942cc7f0a737de4c609a6ac1832e (diff) | |
| parent | 86f951570839e241cfa8effbe195674193693a7f (diff) | |
Merge branch 'nd/conditional-config-include'
$GIT_DIR may in some cases be normalized with all symlinks resolved
while "gitdir" path expansion in the pattern does not receive the
same treatment, leading to incorrect mismatch. This has been fixed.
* nd/conditional-config-include:
config: resolve symlinks in conditional include's patterns
path.c: and an option to call real_path() in expand_user_path()
Diffstat (limited to 'builtin/config.c')
| -rw-r--r-- | builtin/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/config.c b/builtin/config.c index 4f49a0edb9..3f7c8763d2 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -502,7 +502,7 @@ int cmd_config(int argc, const char **argv, const char *prefix) } if (use_global_config) { - char *user_config = expand_user_path("~/.gitconfig"); + char *user_config = expand_user_path("~/.gitconfig", 0); char *xdg_config = xdg_config_home("config"); if (!user_config) |