Re: [PATCH/RFCv2 2/2] format-patch: produce non colorized patches when ui.color=always
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Sep 12, 2011, 18:43 UTC
- Message-ID
- <7vobyp7gaq.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <7vsjo17hws.fsf@alter.siamese.dyndns.org>
I've queued this. Thanks.
-- >8 -- From: Pang Yan Han <pangyanhan@gmail.com> Date: Tue, 13 Sep 2011 01:46:41 +0800 Subject: [PATCH] format-patch: ignore ui.color
commit c9bfb953 (want_color: automatically fallback to color.ui, 2011-08-17) introduced a regression where format-patch produces colorized patches when color.ui is set to "always".
In f3aafa4 (Disable color detection during format-patch, 2006-07-09), git_format_config was taught to intercept diff.color to avoid passing it down to git_log_config and later, git_diff_ui_config.
Teach git_format_config to intercept color.ui in the same way.
Helped-by: Jeff King <peff@peff.net> Signed-off-by: Pang Yan Han <pangyanhan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- builtin/log.c | 3 ++- t/t4014-format-patch.sh | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/builtin/log.c b/builtin/log.c index d760ee0..f5d4930 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -608,7 +608,8 @@ static int git_format_config(const char *var, const char *value, void *cb) string_list_append(&extra_cc, value); return 0; } - if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) { + if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff") || + !strcmp(var, "color.ui")) { return 0; } if (!strcmp(var, "format.numbered")) { diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 5cbc066..7e405d7 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -886,4 +886,12 @@ test_expect_success 'empty subject prefix does not have extra space' ' test_cmp expect actual ' +test_expect_success 'format patch ignores color.ui' ' + test_unconfig color.ui && + git format-patch --stdout -1 >expect && + test_config color.ui always && + git format-patch --stdout -1 >actual && + test_cmp expect actual +' + test_done
-- 1.7.7.rc1