undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'et/pretty-format-c-auto' into maint

Browse Source 
The commands in `git log` family take %C(auto) in a custom format
string.  This unconditionally turned the color on, ignoring
--no-color or with --color=auto when the output is not connected to
a tty; this was corrected to make the format truly behave as
"auto".

* et/pretty-format-c-auto:
  format_commit_message: honor `color=auto` for `%C(auto)`
This commit is contained in:
Junio C Hamano 2016-06-27 09:56:23 -07:00
commit fbb4138cb2
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pretty.c
View File

@ -1063,7 +1063,7 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
switch (placeholder[0]) { switch (placeholder[0]) {
case 'C': case 'C':
if (starts_with(placeholder + 1, "(auto)")) { if (starts_with(placeholder + 1, "(auto)")) {
c->auto_color = 1; c->auto_color = want_color(c->pretty_ctx->color);
return 7; /* consumed 7 bytes, "C(auto)" */ return 7; /* consumed 7 bytes, "C(auto)" */
} else { } else {
int ret = parse_color(sb, placeholder, c); int ret = parse_color(sb, placeholder, c);

26
t/t6006-rev-list-format.sh
View File

@ -184,38 +184,38 @@ commit $head1
foo foo
EOF EOF
test_expect_success '%C(auto) does not enable color by default' ' test_expect_success '%C(auto,...) does not enable color by default' '
git log --format=$AUTO_COLOR -1 >actual && git log --format=$AUTO_COLOR -1 >actual &&
has_no_color actual has_no_color actual
' '
test_expect_success '%C(auto) enables colors for color.diff' ' test_expect_success '%C(auto,...) enables colors for color.diff' '
git -c color.diff=always log --format=$AUTO_COLOR -1 >actual && git -c color.diff=always log --format=$AUTO_COLOR -1 >actual &&
has_color actual has_color actual
' '
test_expect_success '%C(auto) enables colors for color.ui' ' test_expect_success '%C(auto,...) enables colors for color.ui' '
git -c color.ui=always log --format=$AUTO_COLOR -1 >actual && git -c color.ui=always log --format=$AUTO_COLOR -1 >actual &&
has_color actual has_color actual
' '
test_expect_success '%C(auto) respects --color' ' test_expect_success '%C(auto,...) respects --color' '
git log --format=$AUTO_COLOR -1 --color >actual && git log --format=$AUTO_COLOR -1 --color >actual &&
has_color actual has_color actual
' '
test_expect_success '%C(auto) respects --no-color' ' test_expect_success '%C(auto,...) respects --no-color' '
git -c color.ui=always log --format=$AUTO_COLOR -1 --no-color >actual && git -c color.ui=always log --format=$AUTO_COLOR -1 --no-color >actual &&
has_no_color actual has_no_color actual
' '
test_expect_success TTY '%C(auto) respects --color=auto (stdout is tty)' ' test_expect_success TTY '%C(auto,...) respects --color=auto (stdout is tty)' '
test_terminal env TERM=vt100 \ test_terminal env TERM=vt100 \
git log --format=$AUTO_COLOR -1 --color=auto >actual && git log --format=$AUTO_COLOR -1 --color=auto >actual &&
has_color actual has_color actual
' '
test_expect_success '%C(auto) respects --color=auto (stdout not tty)' ' test_expect_success '%C(auto,...) respects --color=auto (stdout not tty)' '
( (
TERM=vt100 && export TERM && TERM=vt100 && export TERM &&
git log --format=$AUTO_COLOR -1 --color=auto >actual && git log --format=$AUTO_COLOR -1 --color=auto >actual &&
@ -223,6 +223,18 @@ test_expect_success '%C(auto) respects --color=auto (stdout not tty)' '
) )
' '
test_expect_success '%C(auto) respects --color' '
git log --color --format="%C(auto)%H" -1 >actual &&
printf "\\033[33m%s\\033[m\\n" $(git rev-parse HEAD) >expect &&
test_cmp expect actual
'
test_expect_success '%C(auto) respects --no-color' '
git log --no-color --format="%C(auto)%H" -1 >actual &&
git rev-parse HEAD >expect &&
test_cmp expect actual
'
iconv -f utf-8 -t $test_encoding > commit-msg <<EOF iconv -f utf-8 -t $test_encoding > commit-msg <<EOF
Test printing of complex bodies Test printing of complex bodies