t6[4-9]*: adjust the references to the default branch name "main"

[thirdparty/git.git] / t / t6433-merge-toplevel.sh

diff --git a/t/t6433-merge-toplevel.sh b/t/t6433-merge-toplevel.sh
index 2d51b2d08c1e3eae4ff8d2d2298ccc76b93e7b1c..b16031465f34b20600cadd51c2f620ec64ae0e54 100755 (executable)
--- a/t/t6433-merge-toplevel.sh
+++ b/t/t6433-merge-toplevel.sh
@@ -2,13 +2,13 @@
 
 test_description='"git merge" top-level frontend'
 
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
 
 t3033_reset () {
-       git checkout -B master two &&
+       git checkout -B main two &&
        git branch -f left three &&
        git branch -f right four
 }
@@ -24,7 +24,7 @@ test_expect_success setup '
        test_commit four &&
        git checkout --orphan newroot &&
        test_commit five &&
-       git checkout master
+       git checkout main
 '
 
 # Local branches
@@ -64,7 +64,7 @@ test_expect_success 'merge octopus, non-fast-forward (ff)' '
 test_expect_success 'merge octopus, fast-forward (does not ff)' '
        t3033_reset &&
        git merge left right &&
-       # two (master) is not an ancestor of three (left) and four (right)
+       # two (main) is not an ancestor of three (left) and four (right)
        test_must_fail git rev-parse --verify HEAD^4 &&
        git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
        git rev-parse two three four | sort >expect &&
@@ -121,7 +121,7 @@ test_expect_success 'merge FETCH_HEAD octopus fast-forward (does not ff)' '
        t3033_reset &&
        git fetch . left right &&
        git merge FETCH_HEAD &&
-       # two (master) is not an ancestor of three (left) and four (right)
+       # two (main) is not an ancestor of three (left) and four (right)
        test_must_fail git rev-parse --verify HEAD^4 &&
        git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
        git rev-parse two three four | sort >expect &&