From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/2] color: downgrade "always" to "auto" only for on-disk configuration
Date: Thu, 12 Oct 2017 08:31:53 -0400 [thread overview]
Message-ID: <20171012123153.i265nun6pklw7kjg@sigill.intra.peff.net> (raw)
In-Reply-To: <20171012021007.7441-2-gitster@pobox.com>
On Thu, Oct 12, 2017 at 11:10:06AM +0900, Junio C Hamano wrote:
> From: Jeff King <peff@peff.net>
>
> An earlier patch downgraded "always" that comes via the ui.color
> configuration variable to "auto", in order to work around an
> unfortunate regression to "git add -i".
>
> That "fix" however regressed other third-party tools that depend on
> "git -c color.ui=always cmd" as the way to defeat any end-user
> configuration and force coloured output from git subcommand, even
> when the output does not go to a terminal.
>
> It is a bit ugly to treat "-c color.ui=always" from the command line
> differently from a definition that comes from on-disk configuration
> files, but it is a moral equivalent of "--color=always" option given
> to the subcommand from the command line, i.e. a signal that tells us
> that the script writer knows what s/he is doing. So let's take that
> route to unbreak this case while defeating a (now declared to be)
> misguided color.ui that is set to always in the configuration file.
>
> NEEDS-SIGN-OFF-BY: Jeff King <peff@peff.net>
Signed-off-by: Jeff King <peff@peff.net>
Thanks for picking this up. I meant to get to it yesterday but ran out
of time. Your description looks good to me.
> color.c | 17 +++++++++++++++--
> 1 file changed, 15 insertions(+), 2 deletions(-)
We should probably protect the command-line behavior with a test. Can
you squash this in?
diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh
index 25a9c65dc5..582cab5c8a 100755
--- a/t/t6006-rev-list-format.sh
+++ b/t/t6006-rev-list-format.sh
@@ -261,6 +261,17 @@ test_expect_success 'rev-list %C(auto,...) respects --color' '
test_cmp expect actual
'
+test_expect_success "color.ui=always in config file same as auto" '
+ test_config color.ui always &&
+ git log --format=$COLOR -1 >actual &&
+ has_no_color actual
+'
+
+test_expect_success "color.ui=always on command-line is always" '
+ git -c color.ui=always log --format=$COLOR -1 >actual &&
+ has_color actual
+'
+
iconv -f utf-8 -t $test_encoding > commit-msg <<EOF
Test printing of complex bodies
Technically the first test is already covered by the "add -p" we added
elsewhere, but I think the sequence make sit easier to understand. Also
as an aside, I think this patch means that:
git -c color.ui=always add -p
is broken (as would a hypothetical "git --default-color=always add -p").
That's sufficiently insane that I'm not sure we should care about it.
-Peff
next prev parent reply other threads:[~2017-10-12 12:32 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-09 23:58 What happened to "git status --color=(always|auto|never)"? Nazri Ramliy
2017-10-10 0:16 ` Jonathan Nieder
2017-10-10 0:43 ` Nazri Ramliy
2017-10-10 0:59 ` Jonathan Nieder
2017-10-10 4:42 ` Nazri Ramliy
2017-10-10 10:25 ` Jeff King
2017-10-10 12:51 ` Junio C Hamano
2017-10-10 13:06 ` Jeff King
2017-10-10 19:03 ` Jonathan Nieder
2017-10-10 19:37 ` Jeff King
2017-10-11 2:05 ` Junio C Hamano
2017-10-12 2:10 ` [PATCH 0/2] Piling more kludge on top of color.ui Junio C Hamano
2017-10-12 2:10 ` [PATCH 1/2] color: downgrade "always" to "auto" only for on-disk configuration Junio C Hamano
2017-10-12 4:47 ` Jonathan Nieder
2017-10-12 5:05 ` Junio C Hamano
2017-10-12 5:40 ` Jonathan Nieder
2017-10-12 6:15 ` Junio C Hamano
2017-10-12 6:58 ` Junio C Hamano
2017-10-12 13:06 ` Jeff King
2017-10-12 15:12 ` Jeff King
2017-10-12 12:31 ` Jeff King [this message]
2017-10-13 0:09 ` Junio C Hamano
2017-10-13 1:47 ` Jeff King
2017-10-13 3:37 ` Junio C Hamano
2017-10-13 13:06 ` Jeff King
2017-10-13 17:20 ` [PATCH 0/4] peeling back color.ui=always hacks Jeff King
2017-10-13 17:23 ` [PATCH 1/4] Revert "color: make "always" the same as "auto" in config" Jeff King
2017-10-13 17:23 ` [PATCH 2/4] Revert "t6006: drop "always" color config tests" Jeff King
2017-10-13 17:24 ` [PATCH 3/4] Revert "color: check color.ui in git_default_config()" Jeff King
2017-10-13 17:26 ` [PATCH 4/4] tag: respect color.ui config Jeff King
2017-10-14 3:01 ` [PATCH 1/2] color: downgrade "always" to "auto" only for on-disk configuration Junio C Hamano
2017-10-16 21:53 ` Jeff King
2017-10-17 1:06 ` Junio C Hamano
2017-10-17 6:26 ` Junio C Hamano
2017-10-18 5:28 ` Jeff King
2017-10-18 5:57 ` Junio C Hamano
2017-10-17 6:51 ` Jonathan Nieder
2017-10-18 5:34 ` Jeff King
2017-10-12 2:10 ` [PATCH 2/2] color: discourage use of ui.color=always Junio C Hamano
2017-10-12 4:48 ` Jonathan Nieder
2017-10-12 15:08 ` Jeff King
2017-10-13 0:02 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171012123153.i265nun6pklw7kjg@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).