Merge branch 'ab/tests-various-fixup'

[thirdparty/git.git] / t / t0021-conversion.sh

diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
index f6deaf498ba9df88f9ea8c648aa3e6ce058207c9..e4c4de5c74563a6ded58c0f553d07a7e59cd2b78 100755 (executable)
--- a/t/t0021-conversion.sh
+++ b/t/t0021-conversion.sh
@@ -2,6 +2,9 @@
 
 test_description='blob conversion via gitattributes'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 TEST_ROOT="$PWD"
@@ -378,8 +381,8 @@ test_expect_success PERL 'required process filter should filter data' '
                test_cmp_count expected.log debug.log &&
 
                git commit -m "test commit 2" &&
-               MASTER=$(git rev-parse --verify master) &&
-               META="ref=refs/heads/master treeish=$MASTER" &&
+               MAIN=$(git rev-parse --verify main) &&
+               META="ref=refs/heads/main treeish=$MAIN" &&
                rm -f test2.r "testsubdir/test3 '\''sq'\'',\$x=.r" &&
 
                filter_git checkout --quiet --no-progress . &&
@@ -404,7 +407,7 @@ test_expect_success PERL 'required process filter should filter data' '
                EOF
                test_cmp_exclude_clean expected.log debug.log &&
 
-               filter_git checkout --quiet --no-progress master &&
+               filter_git checkout --quiet --no-progress main &&
                cat >expected.log <<-EOF &&
                        START
                        init handshake complete
@@ -436,15 +439,15 @@ test_expect_success PERL 'required process filter should filter data for various
                M3=$(git hash-object "testsubdir/test3 '\''sq'\'',\$x=.r") &&
                EMPTY=$(git hash-object /dev/null) &&
 
-               MASTER=$(git rev-parse --verify master) &&
+               MAIN=$(git rev-parse --verify main) &&
 
                cp "$TEST_ROOT/test.o" test5.r &&
                git add test5.r &&
                git commit -m "test commit 3" &&
                git checkout empty-branch &&
-               filter_git rebase --onto empty-branch master^^ master &&
-               MASTER2=$(git rev-parse --verify master) &&
-               META="ref=refs/heads/master treeish=$MASTER2" &&
+               filter_git rebase --onto empty-branch main^^ main &&
+               MAIN2=$(git rev-parse --verify main) &&
+               META="ref=refs/heads/main treeish=$MAIN2" &&
                cat >expected.log <<-EOF &&
                        START
                        init handshake complete
@@ -458,8 +461,8 @@ test_expect_success PERL 'required process filter should filter data for various
                test_cmp_exclude_clean expected.log debug.log &&
 
                git reset --hard empty-branch &&
-               filter_git reset --hard $MASTER &&
-               META="treeish=$MASTER" &&
+               filter_git reset --hard $MAIN &&
+               META="treeish=$MAIN" &&
                cat >expected.log <<-EOF &&
                        START
                        init handshake complete
@@ -471,10 +474,10 @@ test_expect_success PERL 'required process filter should filter data for various
                EOF
                test_cmp_exclude_clean expected.log debug.log &&
 
-               git branch old-master $MASTER &&
+               git branch old-main $MAIN &&
                git reset --hard empty-branch &&
-               filter_git reset --hard old-master &&
-               META="ref=refs/heads/old-master treeish=$MASTER" &&
+               filter_git reset --hard old-main &&
+               META="ref=refs/heads/old-main treeish=$MAIN" &&
                cat >expected.log <<-EOF &&
                        START
                        init handshake complete
@@ -487,9 +490,9 @@ test_expect_success PERL 'required process filter should filter data for various
                test_cmp_exclude_clean expected.log debug.log &&
 
                git checkout -b merge empty-branch &&
-               git branch -f master $MASTER2 &&
-               filter_git merge master &&
-               META="treeish=$MASTER2" &&
+               git branch -f main $MAIN2 &&
+               filter_git merge main &&
+               META="treeish=$MAIN2" &&
                cat >expected.log <<-EOF &&
                        START
                        init handshake complete
@@ -502,8 +505,8 @@ test_expect_success PERL 'required process filter should filter data for various
                EOF
                test_cmp_exclude_clean expected.log debug.log &&
 
-               filter_git archive master >/dev/null &&
-               META="ref=refs/heads/master treeish=$MASTER2" &&
+               filter_git archive main >/dev/null &&
+               META="ref=refs/heads/main treeish=$MAIN2" &&
                cat >expected.log <<-EOF &&
                        START
                        init handshake complete
@@ -516,7 +519,7 @@ test_expect_success PERL 'required process filter should filter data for various
                EOF
                test_cmp_exclude_clean expected.log debug.log &&
 
-               TREE="$(git rev-parse $MASTER2^{tree})" &&
+               TREE="$(git rev-parse $MAIN2^{tree})" &&
                filter_git archive $TREE >/dev/null &&
                META="treeish=$TREE" &&
                cat >expected.log <<-EOF &&
@@ -856,8 +859,8 @@ test_expect_success PERL 'delayed checkout in process filter' '
        ) &&
 
        S=$(test_file_size "$TEST_ROOT/test.o") &&
-       PM="ref=refs/heads/master treeish=$(git -C repo rev-parse --verify master) " &&
-       M="${PM}blob=$(git -C repo rev-parse --verify master:test.a)" &&
+       PM="ref=refs/heads/main treeish=$(git -C repo rev-parse --verify main) " &&
+       M="${PM}blob=$(git -C repo rev-parse --verify main:test.a)" &&
        cat >a.exp <<-EOF &&
                START
                init handshake complete