summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-09-14 21:43:57 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-09-14 21:43:57 -0700
commit559357b508847df5a5736ed7130f6bccab52d044 (patch)
tree49b5175355e95ccc029e759e2f59171fd9ab475e
parentgit-svn: teach git-svn to populate svn:mergeinfo (diff)
parentformat-patch: ignore ui.color (diff)
downloadtgif-559357b508847df5a5736ed7130f6bccab52d044.tar.xz
Merge branch 'ph/format-patch-no-color'
* ph/format-patch-no-color: format-patch: ignore ui.color
-rw-r--r--builtin/log.c3
-rwxr-xr-xt/t4014-format-patch.sh8
2 files changed, 10 insertions, 1 deletions
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