From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, Zefram <zefram@fysh.org>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH] diff-tree: obey the color.ui configuration
Date: Fri, 29 Dec 2017 22:51:21 +0000 [thread overview]
Message-ID: <20171229225121.13805-1-avarab@gmail.com> (raw)
In-Reply-To: <87zi616vgf.fsf@evledraar.gmail.com>
Before git-bisect exits it calls `diff-tree --pretty --stat $commit`
on the bad commit. This would always print the "commit" line with
coloring despite color.ui being set to "never".
Teach diff-tree to look at the git_color_config() configuration. I
initially tried to add this to git_diff_basic_config itself, but it
makes other unrelated things fail, and this is a more isolated change
that solves the issue.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
No idea how to test this, in particular trying to pipe the output of
color.ui=never v.s. color.ui=auto to a file as "auto" will disable
coloring when it detects a pipe, but this fixes the issue.
builtin/diff-tree.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c
index b775a75647..0311c01a87 100644
--- a/builtin/diff-tree.c
+++ b/builtin/diff-tree.c
@@ -97,6 +97,15 @@ static void diff_tree_tweak_rev(struct rev_info *rev, struct setup_revision_opt
}
}
+
+static int diff_tree_config(const char *var, const char *value, void *cb)
+{
+ if (git_color_config(var, value, cb) < 0)
+ return -1;
+
+ return git_diff_basic_config(var, value, cb);
+}
+
int cmd_diff_tree(int argc, const char **argv, const char *prefix)
{
char line[1000];
@@ -108,7 +117,7 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
if (argc == 2 && !strcmp(argv[1], "-h"))
usage(diff_tree_usage);
- git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
+ git_config(diff_tree_config, NULL); /* no "diff" UI options */
init_revisions(opt, prefix);
if (read_cache() < 0)
die(_("index file corrupt"));
--
2.15.1.424.g9478a66081
next prev parent reply other threads:[~2017-12-29 22:51 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-29 19:47 [BUG] git bisect colour output contrary to configuration Zefram
2017-12-29 22:05 ` Ævar Arnfjörð Bjarmason
2017-12-29 22:51 ` Ævar Arnfjörð Bjarmason [this message]
2017-12-29 23:16 ` [PATCH] diff-tree: obey the color.ui configuration Todd Zullinger
2017-12-30 1:55 ` Jeff King
2017-12-30 12:33 ` Ævar Arnfjörð Bjarmason
2017-12-30 14:45 ` Jeff King
2017-12-30 15:04 ` Ævar Arnfjörð Bjarmason
2017-12-30 18:15 ` Jeff King
2017-12-30 23:01 ` Christian Couder
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=20171229225121.13805-1-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=zefram@fysh.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.
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).