want_color: automatically fallback to color.ui

diff --git a/parse-options.c b/parse-options.c
index 42b51ef14514f3c3df454e4b718718a9b58f1612..12a5b25d09ca8725c7e948192235f3d53b331b18 100644 (file)
--- a/parse-options.c
+++ b/parse-options.c
@@ -561,14 +561,14 @@ static int usage_with_options_internal(struct parse_opt_ctx_t *ctx,
        return PARSE_OPT_HELP;
 }
 
-void usage_with_options(const char * const *usagestr,
+void NORETURN usage_with_options(const char * const *usagestr,
                        const struct option *opts)
 {
        usage_with_options_internal(NULL, usagestr, opts, 0, 1);
        exit(129);
 }
 
-void usage_msg_opt(const char *msg,
+void NORETURN usage_msg_opt(const char *msg,
                   const char * const *usagestr,
                   const struct option *options)
 {
@@ -620,7 +620,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, -1);
+       value = git_config_colorbool(NULL, arg);
        if (value < 0)
                return opterror(opt,
                        "expects \"always\", \"auto\", or \"never\"", 0);