diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-10-07 16:27:55 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-10-07 16:27:55 +0900 |
commit | da15b78e52642bd45fd5513ab0000fdf2e58a6f4 (patch) | |
tree | f8888a525b14e9397639f42d3bb9c6f6cb7950ee /t/t4202-log.sh | |
parent | Merge branch 'ma/builtin-unleak' (diff) | |
parent | Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-auto (diff) | |
download | tgif-da15b78e52642bd45fd5513ab0000fdf2e58a6f4.tar.xz |
Merge branch 'jk/ui-color-always-to-auto'
Fix regression of "git add -p" for users with "color.ui = always"
in their configuration, by merging the topic below and adjusting it
for the 'master' front.
* jk/ui-color-always-to-auto:
t7301: use test_terminal to check color
t4015: use --color with --color-moved
color: make "always" the same as "auto" in config
provide --color option for all ref-filter users
t3205: use --color instead of color.branch=always
t3203: drop "always" color test
t6006: drop "always" color config tests
t7502: use diff.noprefix for --verbose test
t7508: use test_terminal for color output
t3701: use test-terminal to collect color output
t4015: prefer --color to -c color.diff=always
test-terminal: set TERM=vt100
Diffstat (limited to 't/t4202-log.sh')
-rwxr-xr-x | t/t4202-log.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 36d120c969..8f155da7a5 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -750,7 +750,7 @@ test_expect_success 'log.decorate config parsing' ' ' test_expect_success TTY 'log output on a TTY' ' - git log --oneline --decorate >expect.short && + git log --color --oneline --decorate >expect.short && test_terminal git log --oneline >actual && test_cmp expect.short actual |