test-reach: test get_merge_bases_many

diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh
index 25a9c65dc51926e3520c9b5f7e1fec709acede10..ec42c2f7797c38f39bb3420402d975a94217d1f4 100755 (executable)
--- a/t/t6006-rev-list-format.sh
+++ b/t/t6006-rev-list-format.sh
@@ -208,11 +208,26 @@ 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 git log --format=$color -1 --color=auto >actual &&
                has_color actual
@@ -225,11 +240,6 @@ 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' '
@@ -437,8 +447,8 @@ test_expect_success '--abbrev' '
        git log -1 --format="%h %h %h" HEAD >actual1 &&
        git log -1 --abbrev=5 --format="%h %h %h" HEAD >actual2 &&
        git log -1 --abbrev=5 --format="%H %H %H" HEAD >actual3 &&
-       sed -e "s/$_x40/LONG/g" -e "s/$_x05/SHORT/g" <actual2 >fuzzy2 &&
-       sed -e "s/$_x40/LONG/g" -e "s/$_x05/SHORT/g" <actual3 >fuzzy3 &&
+       sed -e "s/$OID_REGEX/LONG/g" -e "s/$_x05/SHORT/g" <actual2 >fuzzy2 &&
+       sed -e "s/$OID_REGEX/LONG/g" -e "s/$_x05/SHORT/g" <actual3 >fuzzy3 &&
        test_cmp expect2 fuzzy2 &&
        test_cmp expect3 fuzzy3 &&
        ! test_cmp actual1 actual2