Merge branch 'jn/parse-config-slot' into jk/colors

diff --git a/builtin/clean.c b/builtin/clean.c
index 1032563e5fae880df9256c9eafaa96d60462ecd2..a7e7b0bf6abc0d9d662ab99273dc1c2a86f26698 100644 (file)
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -67,7 +67,7 @@ struct menu_item {
        char hotkey;
        const char *title;
        int selected;
-       int (*fn)();
+       int (*fn)(void);
 };
 
 enum menu_stuff_type {
@@ -116,8 +116,7 @@ static int git_clean_config(const char *var, const char *value, void *cb)
                        return 0;
                if (!value)
                        return config_error_nonbool(var);
-               color_parse(value, var, clean_colors[slot]);
-               return 0;
+               return color_parse(value, clean_colors[slot]);
        }
 
        if (!strcmp(var, "clean.requireforce")) {