Merge branch 'fc/sequencer-plug-leak'

diff --git a/builtin/config.c b/builtin/config.c
index 057bb6127d275d67ee0a3e9c708d788d9a7cdcd3..7759671eb8d44ad341831eeffc96c4469d0652e8 100644 (file)
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -342,7 +342,7 @@ static int get_colorbool(int print)
 
        if (get_colorbool_found < 0)
                /* default value if none found in config */
-               get_colorbool_found = 0;
+               get_colorbool_found = GIT_COLOR_AUTO;
 
        get_colorbool_found = want_color(get_colorbool_found);
 
@@ -384,8 +384,8 @@ int cmd_config(int argc, const char **argv, const char *prefix)
                         */
                        die("$HOME not set");
 
-               if (access_or_warn(user_config, R_OK) &&
-                   xdg_config && !access_or_warn(xdg_config, R_OK))
+               if (access_or_warn(user_config, R_OK, 0) &&
+                   xdg_config && !access_or_warn(xdg_config, R_OK, 0))
                        given_config_file = xdg_config;
                else
                        given_config_file = user_config;