Pang Yan Han <pangyanhan@xxxxxxxxx> writes:
> commit c9bfb953 (want_color: automatically fallback to color.ui,
> 2011-08-17) introduced a regression where format-patch produces colorized
> patches when color.ui is set to "always".
>
> In f3aafa4 (Disable color detection during format-patch, 2006-07-09),
> git_format_config was taught to intercept diff.color to avoid passing it
> down to git_log_config and later, git_diff_ui_config.
>
> Teach git_format_config to intercept color.ui in the same way.
>
> Helped-by: Jeff King <peff@xxxxxxxx>
> Signed-off-by: Pang Yan Han <pangyanhan@xxxxxxxxx>
> ---
> builtin/log.c | 3 ++-
> t/t4051-format-patch-config.sh | 2 +-
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/log.c b/builtin/log.c
> index d760ee0..99f8c4c 100644
> --- a/builtin/log.c
> +++ b/builtin/log.c
> @@ -608,7 +608,8 @@ static int git_format_config(const char *var, const char *value, void *cb)
> string_list_append(&extra_cc, value);
> return 0;
> }
> - if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
> + if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff") ||
> + !strcmp(var, "color.ui")) {
> return 0;
Looks sensible. Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html