Re: Updated to v2.14.2 on macOS; git add --patch broken
From: Junio C Hamano <hidden>
Date: 2017-10-03 03:14:12
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2017-10-20 · Re: Updated to v2.14.2 on macOS; git add --patch broken · Jan Prachař <hidden>
- 2017-10-05 · Re: Updated to v2.14.2 on macOS; git add --patch broken · Jeff King <hidden>
- 2017-10-04 · Re: Updated to v2.14.2 on macOS; git add --patch broken · Junio C Hamano <hidden>
- 2017-10-03 · Re: Updated to v2.14.2 on macOS; git add --patch broken · Jeff King <hidden>
- 2017-10-03 · Re: Updated to v2.14.2 on macOS; git add --patch broken · Junio C Hamano <hidden>
Junio C Hamano [off-list ref] writes:
In any case, I think the first step may be to revert 136c8c8b from both 'master' and 2.14.x. These alternative solutions can come on top. Thoughts?
With the attached patch, after reverting 136c8c8b ("color: check
color.ui in git_default_config()", 2017-07-13) from the tip of
'master', all tests seem to pass. More importantly,
git -c color.ui=always diff-files -p >not-a-tty
will not get colors on its output file, because it does not pay
attention to color.ui configuration.
Note that I haven't _decided_ that reverting is the best way to move
forward (yet). I am just giving a datapoint for people to use when
they assess how painful each possible avenues proposed are.
builtin/for-each-ref.c | 3 ++-
builtin/tag.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index 5d7c921a77..238eb00e09 100644
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c@@ -5,6 +5,7 @@ #include "object.h" #include "parse-options.h" #include "ref-filter.h" +#include "color.h" static char const * const for_each_ref_usage[] = { N_("git for-each-ref [<options>] [<pattern>]"),
@@ -54,7 +55,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix) format.format = "%(objectname) %(objecttype)\t%(refname)"; - git_config(git_default_config, NULL); + git_config(git_color_default_config, NULL); parse_options(argc, argv, prefix, opts, for_each_ref_usage, 0); if (maxcount < 0) {
diff --git a/builtin/tag.c b/builtin/tag.c
index c627794181..f8bc1393ed 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)