From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Sep 2011 04:43:57 +0000 (-0700)
Subject: Merge branch 'ph/format-patch-no-color'
X-Git-Tag: v1.7.7-rc2~3
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/559357b508847df5a5736ed7130f6bccab52d044?hp=1e5814f3def08452aef4caa703f074ba7d167867

Merge branch 'ph/format-patch-no-color'

* ph/format-patch-no-color:
format-patch: ignore ui.color
---

diff --git a/builtin/log.c b/builtin/log.c
index d760ee0885..f5d4930590 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 5cbc066e68..7e405d7af6 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