diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-17 15:08:31 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-17 15:08:31 +0900 |
| commit | 433d62fea95fccdd57a81641618f61544d699126 (patch) | |
| tree | bddf17ab7322486642d7aeb206005d7c1c6d0831 /t/t7004-tag.sh | |
| parent | 4010f1d1b782eb7585e0e0abcefa794bd5ff29a0 (diff) | |
| parent | 6be4595edb8e5b616c6e8b9fbc78b0f831fa2a87 (diff) | |
| download | git-433d62fea95fccdd57a81641618f61544d699126.tar.gz git-433d62fea95fccdd57a81641618f61544d699126.tar.xz | |
Merge branch 'jk/ui-color-always-to-auto-maint' (early part) into jk/ref-filter-colors-fix-maint
* 'jk/ui-color-always-to-auto-maint' (early part):
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/t7004-tag.sh')
| -rwxr-xr-x | t/t7004-tag.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh index dbcd6f623..b90db1bf7 100755 --- a/t/t7004-tag.sh +++ b/t/t7004-tag.sh @@ -1914,13 +1914,13 @@ test_expect_success '%(color) omitted without tty' ' ' test_expect_success TTY '%(color) present with tty' ' - test_terminal env TERM=vt100 git tag $color_args >actual.raw && + test_terminal git tag $color_args >actual.raw && test_decode_color <actual.raw >actual && test_cmp expect.color actual ' -test_expect_success 'color.ui=always overrides auto-color' ' - git -c color.ui=always tag $color_args >actual.raw && +test_expect_success '--color overrides auto-color' ' + git tag --color $color_args >actual.raw && test_decode_color <actual.raw >actual && test_cmp expect.color actual ' |