From: Pang Yan Han Date: Mon, 12 Sep 2011 17:46:41 +0000 (+0800) Subject: format-patch: ignore ui.color X-Git-Tag: v1.7.7-rc2~3^2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=787570c7cddea7ffe3cb2e52c8af169bb17ba29b;p=git.git 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 Signed-off-by: Pang Yan Han Signed-off-by: Junio C Hamano --- diff --git a/builtin/log.c b/builtin/log.c index d760ee088..f5d493059 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 92248d24c..15bd4a648 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -869,4 +869,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