Merge branch 'js/range-diff-wo-dotdot'

[thirdparty/git.git] / t / t1512-rev-parse-disambiguation.sh

diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh
index cc889d7a84274fd2f8c15e90e411053fb80b6561..242abbfa0bc2b3a1303665feee93e23f8c98a1f6 100755 (executable)
--- a/t/t1512-rev-parse-disambiguation.sh
+++ b/t/t1512-rev-parse-disambiguation.sh
@@ -20,6 +20,9 @@ one tagged as v1.0.0.  They all have one regular file each.
 
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 if ! test_have_prereq SHA1
@@ -212,7 +215,7 @@ test_expect_success 'more history' '
        side=$(git rev-parse HEAD) &&
 
        # commit 000000000066
-       git checkout master &&
+       git checkout main &&
 
        # If you use recursive, merge will fail and you will need to
        # clean up a0blgqsjc as well.  If you use resolve, merge will