Merge branch 'ab/tests-various-fixup'

[thirdparty/git.git] / t / t6019-rev-list-ancestry-path.sh

diff --git a/t/t6019-rev-list-ancestry-path.sh b/t/t6019-rev-list-ancestry-path.sh
index 353f84313f33b61c2f06d688cb9dfb75d8d4adf9..20adbece6588a70ab72ac44825e8f359bdcff014 100755 (executable)
--- a/t/t6019-rev-list-ancestry-path.sh
+++ b/t/t6019-rev-list-ancestry-path.sh
@@ -21,6 +21,9 @@ test_description='--ancestry-path'
 #  --ancestry-path G..M -- G.t == L
 #  --ancestry-path --simplify-merges G^..M -- G.t == G L
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_merge () {
@@ -128,15 +131,15 @@ test_expect_success 'setup criss-cross' '
        (cd criss-cross &&
         git init &&
         test_commit A &&
-        git checkout -b xb master &&
+        git checkout -b xb main &&
         test_commit B &&
-        git checkout -b xc master &&
+        git checkout -b xc main &&
         test_commit C &&
         git checkout -b xbc xb -- &&
         git merge xc &&
         git checkout -b xcb xc -- &&
         git merge xb &&
-        git checkout master)
+        git checkout main)
 '
 
 # no commits in bc descend from cb