summaryrefslogtreecommitdiff
path: root/builtin/branch.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2017-07-13 15:09:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-07-13 19:42:51 (GMT)
commit11b087adfd469ca597f1d269314f8cad32d0d72f (patch)
treee0474bf5f8703ab737ca9fd59cae31c0813cc652 /builtin/branch.c
parent18fb7ffc3dc9df081c241d6b7105b4058d5746d3 (diff)
downloadgit-11b087adfd469ca597f1d269314f8cad32d0d72f.zip
git-11b087adfd469ca597f1d269314f8cad32d0d72f.tar.gz
git-11b087adfd469ca597f1d269314f8cad32d0d72f.tar.bz2
ref-filter: consult want_color() before emitting colors
When color placeholders like %(color:red) are used in a ref-filter format, we unconditionally output the colors, even if the user has asked us for no colors. This usually isn't a problem when the user is constructing a --format on the command line, but it means we may do the wrong thing when the format is fed from a script or alias. For example: $ git config alias.b 'branch --format=%(color:green)%(refname)' $ git b --no-color should probably omit the green color. Likewise, running: $ git b >branches should probably also omit the color, just as we would for all baked-in coloring (and as we recently started to do for user-specified colors in --pretty formats). This commit makes both of those cases work by teaching the ref-filter code to consult want_color() before outputting any color. The color flag in ref_format defaults to "-1", which means we'll consult color.ui, which in turn defaults to the usual isatty() check on stdout. However, callers like git-branch which support their own color config (and command-line options) can override that. The new tests independently cover all three of the callers of ref-filter (for-each-ref, tag, and branch). Even though these seem redundant, it confirms that we've correctly plumbed through all of the necessary config to make colors work by default. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/branch.c')
-rw-r--r--builtin/branch.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/branch.c b/builtin/branch.c
index d852ded..16d391b 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -409,6 +409,7 @@ static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sortin
if (!format->format)
format->format = to_free = build_format(filter, maxwidth, remote_prefix);
+ format->use_color = branch_use_color;
if (verify_ref_format(format))
die(_("unable to parse format string"));