diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-18 03:19:08 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-18 03:19:08 +0200 |
| commit | 1c0b983a777bf283250aaf00c94a9a9d4bf8bc9c (patch) | |
| tree | da278177d16ce137f6b19de518b149ba6edcbdca /t/t6300-for-each-ref.sh | |
| parent | Merge branch 'js/rebase-i-final' (diff) | |
| parent | tag: respect color.ui config (diff) | |
| download | git-1c0b983a777bf283250aaf00c94a9a9d4bf8bc9c.tar.xz git-1c0b983a777bf283250aaf00c94a9a9d4bf8bc9c.zip | |
Merge branch 'jk/ref-filter-colors-fix'
This is the "theoretically more correct" approach of simply
stepping back to the state before plumbing commands started paying
attention to "color.ui" configuration variable.
Let's run with this one.
* jk/ref-filter-colors-fix:
tag: respect color.ui config
Revert "color: check color.ui in git_default_config()"
Revert "t6006: drop "always" color config tests"
Revert "color: make "always" the same as "auto" in config"
Diffstat (limited to 't/t6300-for-each-ref.sh')
| -rwxr-xr-x | t/t6300-for-each-ref.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh index 416ff7d0b8..3aa534933e 100755 --- a/t/t6300-for-each-ref.sh +++ b/t/t6300-for-each-ref.sh @@ -442,6 +442,11 @@ test_expect_success '--color can override tty check' ' test_cmp expected.color actual ' +test_expect_success 'color.ui=always does not override tty check' ' + git -c color.ui=always for-each-ref --format="$color_format" >actual && + test_cmp expected.bare actual +' + cat >expected <<\EOF heads/master tags/master |