Merge branch 'nd/conditional-config-in-early-config'

diff --git a/builtin/config.c b/builtin/config.c
index b937d175a9e2fea01983bf39b8fe846c6ea0acf7..1b7ed5af0839d25e063e19c9a83b4233a7c2a3ca 100644 (file)
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -503,7 +503,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)