Merge branch 'nd/conditional-config-include'

diff --git a/builtin/commit.c b/builtin/commit.c
index 4e288bc5132dbc3846382c29b89a15d7bdf7c211..ad188fea9ec552c65c4b82c3558977dd6648fe77 100644 (file)
--- 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);