branch: correctly reject refs/heads/{-dash,HEAD}

diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh
index b326d550f3e281e4b19ab669b95f08e8c63bf555..25a9c65dc51926e3520c9b5f7e1fec709acede10 100755 (executable)
--- 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' '