From: Jeff King <peff@peff.net>
To: Edward Thomson <ethomson@edwardthomson.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] format_commit_message: honor `color=auto` for `%C(auto)`
Date: Thu, 26 May 2016 23:55:54 -0400 [thread overview]
Message-ID: <20160527035553.GA24972@sigill.intra.peff.net> (raw)
In-Reply-To: <20160527034610.GA31629@zoidberg>
On Thu, May 26, 2016 at 10:46:10PM -0500, Edward Thomson wrote:
> git-log(1) documents that when specifying the `%C(auto)` format
> placeholder will "turn on auto coloring on the next %placeholders
> until the color is switched again."
>
> However, when `%C(auto)` is used, the present implementation will turn
> colors on unconditionally (even if the color configuration is turned off
> for the current context - for example, `--no-color` was specified or the
> color is `auto` and the output is not a tty).
>
> Update `format_commit_one` to examine the current context when a format
> string of `%C(auto)` is specified, which ensures that we will not
> unconditionally write colors. This brings that behavior in line with
> the behavior of `%C(auto,<colorname>)`, and allows the user the ability
> to specify that color should be displayed only when the output is a
> tty.
>
> Additionally, add a test for `%C(auto)` and update the existing tests
> for `%C(auto,...)` as they were misidentified as being applicable to
> `%C(auto)`.
Explanation and the patch look good.
> Signed-off-by: Edward Thomson <ethomson@edwardthomson.com>
>
> Tests from Jeff King.
>
> Signed-off-by: Jeff King <peff@peff.net>
Trailers should all go at the bottom in a single stanza, and should
generally be in chronological order (so you got the bits from with an
s-o-b, and then you signed off the whole thing). IOW:
> Tests from Jeff King.
>
> Signed-off-by: Jeff King <peff@peff.net>
> Signed-off-by: Edward Thomson <ethomson@edwardthomson.com>
I suspect Junio can just tweak that while applying, unless there's
another reason to re-roll.
(Also for anybody watching, Ed did not just make up my signoff; I gave
it to him off-list).
-Peff
next prev parent reply other threads:[~2016-05-27 3:56 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-27 3:46 [PATCH] format_commit_message: honor `color=auto` for `%C(auto)` Edward Thomson
2016-05-27 3:55 ` Jeff King [this message]
2016-05-27 6:22 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2016-05-25 1:56 Edward Thomson
2016-05-25 22:39 ` Jeff King
2016-05-27 3:47 ` Edward Thomson
2016-05-31 12:23 ` Duy Nguyen
2016-05-31 22:18 ` Jeff King
2016-05-24 19:48 Edward Thomson
2016-05-25 0:55 ` Junio C Hamano
2016-05-25 1:26 ` Edward Thomson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160527035553.GA24972@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=ethomson@edwardthomson.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).