Merge branch 'ab/detox-gettext-tests'

[thirdparty/git.git] / t / t6030-bisect-porcelain.sh

diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 52614eefc7e766b0c236526a5ee9bca1815241a5..ef7bdcedf2304ef3e6d1379f29742dcfcf5ee28b 100755 (executable)
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -6,6 +6,9 @@ test_description='Tests git bisect functionality'
 
 exec </dev/null
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 add_line_into_file()
@@ -89,9 +92,9 @@ test_expect_success 'bisect start without -- takes unknown arg as pathspec' '
        grep bar ".git/BISECT_NAMES"
 '
 
-test_expect_success 'bisect reset: back in the master branch' '
+test_expect_success 'bisect reset: back in the main branch' '
        git bisect reset &&
-       echo "* master" > branch.expect &&
+       echo "* main" > branch.expect &&
        git branch > branch.output &&
        cmp branch.expect branch.output
 '
@@ -102,7 +105,7 @@ test_expect_success 'bisect reset: back in another branch' '
        git bisect good $HASH1 &&
        git bisect bad $HASH3 &&
        git bisect reset &&
-       echo "  master" > branch.expect &&
+       echo "  main" > branch.expect &&
        echo "* other" >> branch.expect &&
        git branch > branch.output &&
        cmp branch.expect branch.output
@@ -348,7 +351,7 @@ test_expect_success 'bisect skip many ranges' '
 
 test_expect_success 'bisect starting with a detached HEAD' '
        git bisect reset &&
-       git checkout master^ &&
+       git checkout main^ &&
        HEAD=$(git rev-parse --verify HEAD) &&
        git bisect start &&
        test $HEAD = $(cat .git/BISECT_START) &&
@@ -716,7 +719,7 @@ test_expect_success 'bisect: --no-checkout - target after breakage' '
 test_expect_success 'bisect: demonstrate identification of damage boundary' "
        git bisect reset &&
        git checkout broken &&
-       git bisect start broken master --no-checkout &&
+       git bisect start broken main --no-checkout &&
        test_must_fail git bisect run \"\$SHELL_PATH\" -c '
                GOOD=\$(git for-each-ref \"--format=%(objectname)\" refs/bisect/good-*) &&
                git rev-list --objects BISECT_HEAD --not \$GOOD >tmp.\$\$ &&
@@ -826,7 +829,7 @@ test_expect_success 'bisect terms needs 0 or 1 argument' '
        test_must_fail git bisect terms 1 2 &&
        test_must_fail git bisect terms 2>actual &&
        echo "error: no terms defined" >expected &&
-       test_i18ncmp expected actual
+       test_cmp expected actual
 '
 
 test_expect_success 'bisect terms shows good/bad after start' '
@@ -900,7 +903,7 @@ test_expect_success 'bisect start --term-* does store terms' '
        Your current terms are two for the old state
        and one for the new state.
        EOF
-       test_i18ncmp expected actual &&
+       test_cmp expected actual &&
        git bisect terms --term-bad >actual &&
        echo one >expected &&
        test_cmp expected actual &&