diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-04 03:03:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-04 03:04:47 (GMT) |
| commit | aebd23506ec952c1ca68d577afc59d3e2f7bd7ce (patch) | |
| tree | 26f8c0cb722c3a993f958aa06fce7eaf76794345 /t/t6006-rev-list-format.sh | |
| parent | 3c788e79b8570c9015f6077591c819862a7e39e8 (diff) | |
| parent | 6be4595edb8e5b616c6e8b9fbc78b0f831fa2a87 (diff) | |
| download | git-aebd23506ec952c1ca68d577afc59d3e2f7bd7ce.zip git-aebd23506ec952c1ca68d577afc59d3e2f7bd7ce.tar.gz git-aebd23506ec952c1ca68d577afc59d3e2f7bd7ce.tar.bz2 | |
Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-auto
* jk/ui-color-always-to-auto-maint:
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/t6006-rev-list-format.sh')
| -rwxr-xr-x | t/t6006-rev-list-format.sh | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh index b326d55..25a9c65 100755 --- a/t/t6006-rev-list-format.sh +++ b/t/t6006-rev-list-format.sh @@ -208,29 +208,13 @@ do has_no_color actual ' - test_expect_success "$desc enables colors for color.diff" ' - git -c color.diff=always log --format=$color -1 >actual && - has_color actual - ' - - test_expect_success "$desc enables colors for color.ui" ' - git -c color.ui=always log --format=$color -1 >actual && - has_color actual - ' - test_expect_success "$desc respects --color" ' git log --format=$color -1 --color >actual && has_color actual ' - test_expect_success "$desc respects --no-color" ' - git -c color.ui=always log --format=$color -1 --no-color >actual && - has_no_color actual - ' - test_expect_success TTY "$desc respects --color=auto (stdout is tty)" ' - test_terminal env TERM=vt100 \ - git log --format=$color -1 --color=auto >actual && + test_terminal git log --format=$color -1 --color=auto >actual && has_color actual ' @@ -241,6 +225,11 @@ do has_no_color actual ) ' + + test_expect_success TTY "$desc respects --no-color" ' + test_terminal git log --format=$color -1 --no-color >actual && + has_no_color actual + ' done test_expect_success '%C(always,...) enables color even without tty' ' |