[PATCH/RFCv2 2/2] format-patch: produce non colorized patches when ui.color=always
- From
Pang Yan Han <pangyanhan@gmail.com>
- Date
- Sep 12, 2011, 17:46 UTC
- Message-ID
- <1315849601-26497-3-git-send-email-pangyanhan@gmail.com>
- In-Reply-To
- <1315849601-26497-1-git-send-email-pangyanhan@gmail.com>
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> --- builtin/log.c | 3 ++- t/t4051-format-patch-config.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/builtin/log.c b/builtin/log.c index d760ee0..99f8c4c 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/t4051-format-patch-config.sh b/t/t4051-format-patch-config.sh index cea9c7d..35b349e 100755 --- a/t/t4051-format-patch-config.sh +++ b/t/t4051-format-patch-config.sh @@ -13,7 +13,7 @@ test_expect_success setup ' git commit -m "commit2" ' -test_expect_failure 'format patch with ui.color=always generates non colorized patch' ' +test_expect_success 'format patch with ui.color=always generates non colorized patch' ' git config color.ui always && git format-patch -1 && mv 0001-commit2.patch actual &&
-- 1.7.7.rc0.190.gb47b6