diff options
| author | Glen Choo <chooglen@google.com> | 2023-06-28 22:26:20 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-06-29 00:06:38 +0300 |
| commit | 97eeeea2dc069a1fcb03db99ef3810ebe3056188 (patch) | |
| tree | 44d42f1a7533469948e7d5f181a34198ef109123 /builtin | |
| parent | 6ff334181cfb6485d3ba50843038209a2a253907 (diff) | |
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')
| -rw-r--r-- | builtin/add.c | 5 | ||||
| -rw-r--r-- | builtin/branch.c | 5 | ||||
| -rw-r--r-- | builtin/clean.c | 6 | ||||
| -rw-r--r-- | builtin/grep.c | 5 | ||||
| -rw-r--r-- | builtin/show-branch.c | 5 | ||||
| -rw-r--r-- | builtin/tag.c | 6 |
6 files changed, 25 insertions, 7 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_( diff --git a/builtin/branch.c b/builtin/branch.c index 075e580d22..8337b9e71b 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -117,7 +117,10 @@ static int git_branch_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 *branch_get_color(enum color_branch ix) 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) diff --git a/builtin/grep.c b/builtin/grep.c index b86c754def..76cf999d31 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -293,7 +293,10 @@ static int wait_all(void) static int grep_cmd_config(const char *var, const char *value, void *cb) { int st = grep_config(var, value, cb); - if (git_color_default_config(var, value, NULL) < 0) + + if (git_color_config(var, value, cb) < 0) + st = -1; + else if (git_default_config(var, value, cb) < 0) st = -1; if (!strcmp(var, "grep.threads")) { diff --git a/builtin/show-branch.c b/builtin/show-branch.c index 7ef4a642c1..a2461270d4 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -579,7 +579,10 @@ static int git_show_branch_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 int omit_in_dense(struct commit *commit, struct commit **rev, int n) diff --git a/builtin/tag.c b/builtin/tag.c index 49b64c7a28..1acf5f7a59 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -209,7 +209,11 @@ static int git_tag_config(const char *var, const char *value, void *cb) if (starts_with(var, "column.")) return git_column_config(var, value, "tag", &colopts); - 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 void write_tag_body(int fd, const struct object_id *oid) |