diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-10-06 14:53:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-06 14:53:12 -0700 |
| commit | 578e6021c0819d7be1179e05e7ce0e6fdb2a01b7 (patch) | |
| tree | a888a1c8322c16f3218d6267c2395af75f1f32d0 /t | |
| parent | Merge branch 'ps/http-gssapi-cred-delegation' (diff) | |
| parent | pretty: avoid adding reset for %C(auto) if output is empty (diff) | |
| download | tgif-578e6021c0819d7be1179e05e7ce0e6fdb2a01b7.tar.xz | |
Merge branch 'rs/c-auto-resets-attributes'
When "%C(auto)" appears at the very beginning of the pretty format
string, it did not need to issue the reset sequence, but it did.
* rs/c-auto-resets-attributes:
pretty: avoid adding reset for %C(auto) if output is empty
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6006-rev-list-format.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh index f6020cd2aa..a1dcdb81d7 100755 --- a/t/t6006-rev-list-format.sh +++ b/t/t6006-rev-list-format.sh @@ -225,7 +225,7 @@ 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[m\\033[33m%s\\033[m\\n" $(git rev-parse HEAD) >expect && + printf "\\033[33m%s\\033[m\\n" $(git rev-parse HEAD) >expect && test_cmp expect actual ' |