git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH/RFCv2 2/2] format-patch: produce non colorized patches when ui.color=always

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 12, 2011, 18:08 UTC
Message-ID
<7vsjo17hws.fsf@alter.siamese.dyndns.org>
In-Reply-To
<1315849601-26497-3-git-send-email-pangyanhan@gmail.com>
Pang Yan Han <pangyanhan@gmail.com> writes:
Show 29 quoted lines
> 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@peff.net>
> Signed-off-by: Pang Yan Han <pangyanhan@gmail.com>
> ---
>  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.
Previous: Pang Yan HanNext: Junio C Hamano
Message 5 of 6 in “format-patch: produce non colorized patches when color.ui=always”
  1. 0/2 format-patch: produce non colorized patches when color.ui=alwaysPang Yan Han, Sep 12, 2011
  2. 1/2 format-patch: demonstrate that color.ui=always produces colorized patchesPang Yan Han, Sep 12, 2011
  3. Junio C HamanoSep 12, 2011
  4. 2/2 format-patch: produce non colorized patches when ui.color=alwaysPang Yan Han, Sep 12, 2011
  5. Junio C HamanoSep 12, 2011
  6. Junio C HamanoSep 12, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.