diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-04 06:03:05 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-04 06:04:47 +0300 |
| commit | aebd23506ec952c1ca68d577afc59d3e2f7bd7ce (patch) | |
| tree | 26f8c0cb722c3a993f958aa06fce7eaf76794345 /t/t7301-clean-interactive.sh | |
| parent | 3c788e79b8570c9015f6077591c819862a7e39e8 (diff) | |
| parent | 6be4595edb8e5b616c6e8b9fbc78b0f831fa2a87 (diff) | |
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/t7301-clean-interactive.sh')
| -rwxr-xr-x | t/t7301-clean-interactive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7301-clean-interactive.sh b/t/t7301-clean-interactive.sh index 39212dccd2..1bf9789c8a 100755 --- a/t/t7301-clean-interactive.sh +++ b/t/t7301-clean-interactive.sh @@ -476,7 +476,7 @@ test_expect_success 'git clean -id with prefix and path (ask)' ' test_expect_success TTY 'git clean -i paints the header in HEADER color' ' >a.out && echo q | - test_terminal env TERM=vt100 git clean -i | + test_terminal git clean -i | test_decode_color | head -n 1 >header && # not i18ngrep |