aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/add.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/add.c
parent6ff334181cfb6485d3ba50843038209a2a253907 (diff)
downloadgit-97eeeea2dc069a1fcb03db99ef3810ebe3056188.tar.gz
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/add.c')
-rw-r--r--builtin/add.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/builtin/add.c b/builtin/add.c
index 6137e7b4ad..e01efdfc50 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -365,7 +365,10 @@ static int add_config(const char *var, const char *value, void *cb)
return 0;
}
- 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 embedded_advice[] = N_(