threads / patch / 42442

patchformat_commit_message: honor `color=auto` for `%C(auto)`

Subject: [PATCH] format_commit_message: honor `color=auto` for `%C(auto)`

## tl;dr

3 messages between May 24, 2016 and May 25, 2016. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Edward Thomson· May 24, 2016, 19:48 UTC · lore

Check that we are configured to display colors in the given context when the user specifies a format string of `%C(auto)`, instead of always displaying the default color for the given context. This makes `%C(auto)` obey the `color=auto` setting and brings its behavior in line with the behavior of `%C(auto,<colorname>)`.

This allows the user the ability to specify that color should be
displayed for a string only when the output is a tty, and to use the
default color for the given context without having to hardcode a
color value.
---
 pretty.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to pretty.c +1 −1

diff --git a/pretty.c b/pretty.c
index 87c4497..c3ec430 100644
--- a/pretty.c
+++ b/pretty.c
@@ -1063,7 +1063,7 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
 	switch (placeholder[0]) {
 	case 'C':
 		if (starts_with(placeholder + 1, "(auto)")) {
-			c->auto_color = 1;
+			c->auto_color = want_color(c->pretty_ctx->color);
 			return 7; /* consumed 7 bytes, "C(auto)" */
 		} else {
 			int ret = parse_color(sb, placeholder, c);

-- 
2.6.4 (Apple Git-63)

Junio C Hamano· May 25, 2016, 00:55 UTC · re: Edward Thomson · lore

Re: [PATCH] format_commit_message: honor `color=auto` for `%C(auto)`

On Tue, May 24, 2016 at 12:48 PM, Edward Thomson <ethomson@edwardthomson.com> wrote:

Show 13 quoted lines

> Check that we are configured to display colors in the given context when
> the user specifies a format string of `%C(auto)`, instead of always
> displaying the default color for the given context.  This makes
> `%C(auto)` obey the `color=auto` setting and brings its behavior in line
> with the behavior of `%C(auto,<colorname>)`.
>
> This allows the user the ability to specify that color should be
> displayed for a string only when the output is a tty, and to use the
> default color for the given context without having to hardcode a
> color value.
> ---
>  pretty.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Looks obviously the right thing to do from a cursory read. Missing sign-off?

Thanks.

Edward Thomson· May 25, 2016, 01:26 UTC · re: Junio C Hamano · lore

Re: [PATCH] format_commit_message: honor `color=auto` for `%C(auto)`

On Tue, May 24, 2016 at 05:55:02PM -0700, Junio C Hamano wrote:

> Looks obviously the right thing to do from a cursory read.
> Missing sign-off?

Yes, apologies for the oversight; will re-send.

Thanks- -ed