Merge branch 'pt/xdg-config-path' into maint

[thirdparty/git.git] / config.c

diff --git a/config.c b/config.c
index c4424c01388496b5995e19f9601f0c87b9fdd3c0..286907b97e5a378e2be9677ee5b6a4fe7f6169af 100644 (file)
--- a/config.c
+++ b/config.c
@@ -1185,10 +1185,8 @@ int git_config_system(void)
 int git_config_early(config_fn_t fn, void *data, const char *repo_config)
 {
        int ret = 0, found = 0;
-       char *xdg_config = NULL;
-       char *user_config = NULL;
-
-       home_config_paths(&user_config, &xdg_config, "config");
+       char *xdg_config = xdg_config_home("config");
+       char *user_config = expand_user_path("~/.gitconfig");
 
        if (git_config_system() && !access_or_die(git_etc_gitconfig(), R_OK, 0)) {
                ret += git_config_from_file(fn, git_etc_gitconfig(),