aboutsummaryrefslogtreecommitdiff
path: root/builtin/clean.c
diff options
context:
space:
mode:
authorGlen Choo <chooglen@google.com>2023-06-28 19:26:20 +0000
committerJunio C Hamano <gitster@pobox.com>2023-06-28 14:06:38 -0700
commit97eeeea2dc069a1fcb03db99ef3810ebe3056188 (patch)
tree44d42f1a7533469948e7d5f181a34198ef109123 /builtin/clean.c
parent6ff334181cfb6485d3ba50843038209a2a253907 (diff)
downloadgit-97eeeea2dc069a1fcb03db99ef3810ebe3056188.tar.xz
config: inline git_color_default_config
git_color_default_config() is a shorthand for calling two other config callbacks. There are no other non-static functions that do this and it will complicate our refactoring of config_fn_t so inline it instead. Signed-off-by: Glen Choo <chooglen@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/clean.c')
-rw-r--r--builtin/clean.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/builtin/clean.c b/builtin/clean.c
index 78852d28ce..57e7f7cac6 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -130,8 +130,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, cb);
}
static const char *clean_get_color(enum color_clean ix)