]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/log.c
format-patch: ignore ui.color
authorPang Yan Han <pangyanhan@gmail.com>
Mon, 12 Sep 2011 17:46:41 +0000 (01:46 +0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Sep 2011 18:43:58 +0000 (11:43 -0700)
commit787570c7cddea7ffe3cb2e52c8af169bb17ba29b
treede3d16dcb3e162ff5b8903629e0460b2b4e1d9e9
parentc9bfb953489e559d513c1627150aa16f8d42d6c5
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
t/t4014-format-patch.sh