summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-04-24 05:07:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-04-24 05:07:46 (GMT)
commita2e2c046833be53e7599ee7fed5c45f16580ab37 (patch)
tree0ea4faab2f6b99ac0cbbfebdd1e4f35ac7eff622 /builtin
parent4c01f67d9102942cc7f0a737de4c609a6ac1832e (diff)
parent86f951570839e241cfa8effbe195674193693a7f (diff)
downloadgit-a2e2c046833be53e7599ee7fed5c45f16580ab37.zip
git-a2e2c046833be53e7599ee7fed5c45f16580ab37.tar.gz
git-a2e2c046833be53e7599ee7fed5c45f16580ab37.tar.bz2
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')
-rw-r--r--builtin/commit.c2
-rw-r--r--builtin/config.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/commit.c b/builtin/commit.c
index 4e288bc..ad188fe 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);
diff --git a/builtin/config.c b/builtin/config.c
index 4f49a0e..3f7c876 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)