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 /credential-cache.c | |
| parent | 4c01f67d9102942cc7f0a737de4c609a6ac1832e (diff) | |
| parent | 86f951570839e241cfa8effbe195674193693a7f (diff) | |
| download | git-a2e2c046833be53e7599ee7fed5c45f16580ab37.tar.gz git-a2e2c046833be53e7599ee7fed5c45f16580ab37.tar.xz | |
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 'credential-cache.c')
| -rw-r--r-- | credential-cache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/credential-cache.c b/credential-cache.c index 3cbd42001..91550bfb0 100644 --- a/credential-cache.c +++ b/credential-cache.c @@ -87,7 +87,7 @@ static char *get_socket_path(void) { struct stat sb; char *old_dir, *socket; - old_dir = expand_user_path("~/.git-credential-cache"); + old_dir = expand_user_path("~/.git-credential-cache", 0); if (old_dir && !stat(old_dir, &sb) && S_ISDIR(sb.st_mode)) socket = xstrfmt("%s/socket", old_dir); else |