diff options
| author | Jeff King <peff@peff.net> | 2025-09-16 16:13:28 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-09-16 13:37:03 -0700 |
| commit | 3c3e9b830383364316ba07730aecbc47a680b513 (patch) | |
| tree | 0c3fd45dc4db8508d937a87c2b98de5225514682 /parse-options-cb.c | |
| parent | e335ff31f70aefc91991063cdc05967096bb1be3 (diff) | |
| download | git-3c3e9b830383364316ba07730aecbc47a680b513.tar.xz | |
color: use GIT_COLOR_* instead of numeric constants
Long ago Git's decision to show color for a subsytem was stored in a
tri-state variable: it could be true (1), false (0), or unknown (-1).
But since daa0c3d971 (color: delay auto-color decision until point of
use, 2011-08-17) we want to carry around a new state, "auto", which
bases the decision on the tty-ness of stdout (rather than collapsing
that "auto" state to a true/false immediately).
That commit introduced a set of GIT_COLOR_* defines to represent each
state: UNKNOWN, ALWAYS, NEVER, and AUTO. But it only used the AUTO
value, and left alone code using bare 0/1/-1 values. And of course since
then we've grown many new spots that use those bare values.
Let's switch all of these to use the named constants. That should make
the code a bit easier to read, as it is more obvious that we're
representing a color decision.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'parse-options-cb.c')
| -rw-r--r-- | parse-options-cb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/parse-options-cb.c b/parse-options-cb.c index 50c8afe412..e13e0a9e33 100644 --- a/parse-options-cb.c +++ b/parse-options-cb.c @@ -55,7 +55,7 @@ int parse_opt_color_flag_cb(const struct option *opt, const char *arg, if (!arg) arg = unset ? "never" : (const char *)opt->defval; value = git_config_colorbool(NULL, arg); - if (value < 0) + if (value == GIT_COLOR_UNKNOWN) return error(_("option `%s' expects \"always\", \"auto\", or \"never\""), opt->long_name); *(int *)opt->value = value; |