diff options
Diffstat (limited to 'builtin/clean.c')
| -rw-r--r-- | builtin/clean.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/builtin/clean.c b/builtin/clean.c index 78852d28ce..49c224e626 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -9,11 +9,12 @@ #define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "abspath.h" -#include "cache.h" #include "config.h" #include "dir.h" #include "gettext.h" #include "parse-options.h" +#include "path.h" +#include "read-cache-ll.h" #include "repository.h" #include "setup.h" #include "string-list.h" @@ -103,7 +104,8 @@ struct menu_stuff { define_list_config_array(color_interactive_slots); -static int git_clean_config(const char *var, const char *value, void *cb) +static int git_clean_config(const char *var, const char *value, + const struct config_context *ctx, void *cb) { const char *slot_name; @@ -130,8 +132,10 @@ static int git_clean_config(const char *var, const char *value, void *cb) return 0; } - /* inspect the color.ui config variable and others */ - return git_color_default_config(var, value, cb); + if (git_color_config(var, value, cb) < 0) + return -1; + + return git_default_config(var, value, ctx, cb); } static const char *clean_get_color(enum color_clean ix) |