Merge branch 'js/fast-export-paths-with-spaces'

diff --git a/builtin/config.c b/builtin/config.c
index da54fd1e1239700ed19afa50ac0f24a51e5f044a..e8e1c0a4567f190c4b5d939bf9b0d363765bfd30 100644 (file)
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -387,10 +387,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 
                home_config_paths(&user_config, &xdg_config, "config");
 
-               if (access(user_config, R_OK) && !access(xdg_config, R_OK) &&
-                   (actions == ACTION_LIST ||
-                    actions == ACTION_GET_COLOR ||
-                    actions == ACTION_GET_COLORBOOL))
+               if (access(user_config, R_OK) && !access(xdg_config, R_OK))
                        given_config_file = xdg_config;
                else if (user_config)
                        given_config_file = user_config;