mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* ph/format-patch-no-color:
  format-patch: ignore ui.color
This commit is contained in:
Junio C Hamano
2011-09-14 21:43:57 -07:00
parent 1e5814f3de 787570c7cd
commit 559357b508
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/log.c
View File

@ -608,7 +608,8 @@ static int git_format_config(const char *var, const char *value, void *cb)
string_list_append(&extra_cc, value); string_list_append(&extra_cc, value);
return 0; 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; return 0;
} }
if (!strcmp(var, "format.numbered")) { if (!strcmp(var, "format.numbered")) {

8
t/t4014-format-patch.sh
View File

@ -886,4 +886,12 @@ test_expect_success 'empty subject prefix does not have extra space' '
test_cmp expect actual 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 test_done