From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jonathan Nieder <jrnieder@gmail.com>, git@vger.kernel.org
Subject: [PATCH 4/4] tag: respect color.ui config
Date: Fri, 13 Oct 2017 13:26:02 -0400 [thread overview]
Message-ID: <20171013172601.spqiyuutxs4fmlgz@sigill.intra.peff.net> (raw)
In-Reply-To: <20171013172020.adc2fkddgp3g2ses@sigill.intra.peff.net>
Since 11b087adfd (ref-filter: consult want_color() before
emitting colors, 2017-07-13), we expect that setting
"color.ui" to "always" will enable color tag formats even
without a tty. As that commit was built on top of
136c8c8b8f (color: check color.ui in git_default_config(),
2017-07-13) from the same series, we didn't need to touch
tag's config parsing at all.
However, since we reverted 136c8c8b8f, we now need to
explicitly call git_color_default_config() to make this
work.
Let's do so, and also restore the test dropped in 0c88bf5050
(provide --color option for all ref-filter users,
2017-10-03). That commit swapped out our "color.ui=always"
test for "--color" in preparation for "always" going away.
But since it is here to stay, we should test both cases.
Note that for-each-ref also lost its color.ui support as
part of reverting 136c8c8b8f. But as a plumbing command, it
should _not_ respect the color.ui config. Since it also
gained a --color option in 0c88bf5050, that's the correct
way to ask it for color. We'll continue to test that, and
confirm that "color.ui" is not respected.
Signed-off-by: Jeff King <peff@peff.net>
---
builtin/tag.c | 2 +-
t/t6300-for-each-ref.sh | 5 +++++
t/t7004-tag.sh | 6 ++++++
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/builtin/tag.c b/builtin/tag.c
index 695cb0778e..b38329b593 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -158,7 +158,7 @@ static int git_tag_config(const char *var, const char *value, void *cb)
if (starts_with(var, "column."))
return git_column_config(var, value, "tag", &colopts);
- return git_default_config(var, value, cb);
+ return git_color_default_config(var, value, cb);
}
static void write_tag_body(int fd, const struct object_id *oid)
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index 416ff7d0b8..3aa534933e 100755
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -442,6 +442,11 @@ test_expect_success '--color can override tty check' '
test_cmp expected.color actual
'
+test_expect_success 'color.ui=always does not override tty check' '
+ git -c color.ui=always for-each-ref --format="$color_format" >actual &&
+ test_cmp expected.bare actual
+'
+
cat >expected <<\EOF
heads/master
tags/master
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 4e62c505fc..a9af2de996 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -1918,6 +1918,12 @@ test_expect_success '--color overrides auto-color' '
test_cmp expect.color actual
'
+test_expect_success 'color.ui=always overrides auto-color' '
+ git -c color.ui=always tag $color_args >actual.raw &&
+ test_decode_color <actual.raw >actual &&
+ test_cmp expect.color actual
+'
+
test_expect_success 'setup --merged test tags' '
git tag mergetest-1 HEAD~2 &&
git tag mergetest-2 HEAD~1 &&
--
2.15.0.rc1.395.ga4290b5804
next prev parent reply other threads:[~2017-10-13 17:27 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
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 ` Jeff King [this message]
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=20171013172601.spqiyuutxs4fmlgz@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.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).