diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-04-23 22:07:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-23 22:07:46 -0700 |
| commit | a2e2c046833be53e7599ee7fed5c45f16580ab37 (patch) | |
| tree | 0ea4faab2f6b99ac0cbbfebdd1e4f35ac7eff622 /builtin/commit.c | |
| parent | 4c01f67d9102942cc7f0a737de4c609a6ac1832e (diff) | |
| parent | 86f951570839e241cfa8effbe195674193693a7f (diff) | |
| download | git-a2e2c046833be53e7599ee7fed5c45f16580ab37.tar.gz | |
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/commit.c')
| -rw-r--r-- | builtin/commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 4e288bc513..ad188fea9e 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1404,7 +1404,7 @@ int cmd_status(int argc, const char **argv, const char *prefix) static const char *implicit_ident_advice(void) { - char *user_config = expand_user_path("~/.gitconfig"); + char *user_config = expand_user_path("~/.gitconfig", 0); char *xdg_config = xdg_config_home("config"); int config_exists = file_exists(user_config) || file_exists(xdg_config); |