t8*: adjust the references to the default branch name "main"

This trick was performed via

	$ (cd t &&
	   sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \
		-e 's/Master/Main/g' -- t8*.sh annotate*.sh)

This allows us to define `GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main`
for those tests.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index 3aee61d2cc1fa6bc97976fff30d3516f55abab80..ee5d2d4cf81972bfc82c9d74af7e7b5341f5d24b 100644 (file)
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -95,7 +95,7 @@ test_expect_success 'blame 2 authors' '
 '
 
 test_expect_success 'setup B1 lines (branch1)' '
-       git checkout -b branch1 master &&
+       git checkout -b branch1 main &&
        echo "3A slow green fox jumps into the" >>file &&
        echo "well." >>file &&
        GIT_AUTHOR_NAME="B1" GIT_AUTHOR_EMAIL="B1@test.git" \
@@ -107,7 +107,7 @@ test_expect_success 'blame 2 authors + 1 branch1 author' '
 '
 
 test_expect_success 'setup B2 lines (branch2)' '
-       git checkout -b branch2 master &&
+       git checkout -b branch2 main &&
        sed -e "s/2A quick brown/4A quick brown lazy dog/" <file >file.new &&
        mv file.new file &&
        GIT_AUTHOR_NAME="B2" GIT_AUTHOR_EMAIL="B2@test.git" \
@@ -131,11 +131,11 @@ test_expect_success 'blame --first-parent blames merge for branch1' '
 '
 
 test_expect_success 'blame ancestor' '
-       check_count -h master A 2 B 2
+       check_count -h main A 2 B 2
 '
 
 test_expect_success 'blame great-ancestor' '
-       check_count -h master^ A 2
+       check_count -h main^ A 2
 '
 
 test_expect_success 'setup evil merge' '

diff --git a/t/t8001-annotate.sh b/t/t8001-annotate.sh
index f661007c85e14f7e21db76fe48fbbab8046324e8..a536a621b24a4ee0a010fd5a3e565d2711d67806 100755 (executable)
--- a/t/t8001-annotate.sh
+++ b/t/t8001-annotate.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 test_description='git annotate'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
@@ -10,7 +10,7 @@ PROG='git annotate'
 . "$TEST_DIRECTORY"/annotate-tests.sh
 
 test_expect_success 'annotate old revision' '
-       git annotate file master >actual &&
+       git annotate file main >actual &&
        awk "{ print \$3; }" <actual >authors &&
        test 2 = $(grep A <authors | wc -l) &&
        test 2 = $(grep B <authors | wc -l)

diff --git a/t/t8002-blame.sh b/t/t8002-blame.sh
index 89a319d2c779885d03fb3e1e214fb922f3cfa7ef..5bb302b1ba0f36eff7c3bd64a4a0dd690a135559 100755 (executable)
--- a/t/t8002-blame.sh
+++ b/t/t8002-blame.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 test_description='git blame'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh

diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh
index 0613d889dbe2ebd9590f8847277ed22cad2f4894..da80f815ce9d38f109df07a8dcbe803f8a794309 100755 (executable)
--- a/t/t8003-blame-corner-cases.sh
+++ b/t/t8003-blame-corner-cases.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 test_description='git blame corner cases'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
@@ -164,13 +164,13 @@ test_expect_success 'blame wholesale copy and more in the index' '
 
 test_expect_success 'blame during cherry-pick with file rename conflict' '
 
-       test_when_finished "git reset --hard && git checkout master" &&
+       test_when_finished "git reset --hard && git checkout main" &&
        git checkout HEAD~3 &&
        echo MOUSE >> mouse &&
        git mv mouse rodent &&
        git add rodent &&
        GIT_AUTHOR_NAME=Rodent git commit -m "rodent" &&
-       git checkout --detach master &&
+       git checkout --detach main &&
        (git cherry-pick HEAD@{1} || test $? -eq 1) &&
        git show HEAD@{1}:rodent > rodent &&
        git add rodent &&

diff --git a/t/t8004-blame-with-conflicts.sh b/t/t8004-blame-with-conflicts.sh
index ffce1d1195edd7b7fc487e9a53cec466eec7e8a1..35414a53363424190e57a553302c6384e3664e2c 100755 (executable)
--- a/t/t8004-blame-with-conflicts.sh
+++ b/t/t8004-blame-with-conflicts.sh
@@ -3,7 +3,7 @@
 # Based on a test case submitted by Björn Steinbrink.
 
 test_description='git blame on conflicted files'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
@@ -24,16 +24,16 @@ test_expect_success 'setup first case' '
        git add file2 &&
        git commit --author "U Gly <ug@localhost>" -m ugly &&
 
-       # Back to master and change something
-       git checkout master &&
+       # Back to main and change something
+       git checkout main &&
        echo "
 
 bla" >> file1 &&
        git commit --author "Old Line <ol@localhost>" -a -m file1.b &&
 
-       # Back to foo and merge master
+       # Back to foo and merge main
        git checkout foo &&
-       if git merge master; then
+       if git merge main; then
                echo needed conflict here
                exit 1
        else
@@ -47,8 +47,8 @@ Even more" > file2 &&
        git rm file1 &&
        git commit --author "M Result <mr@localhost>" -a -m merged &&
 
-       # Back to master and change file1 again
-       git checkout master &&
+       # Back to main and change file1 again
+       git checkout main &&
        sed s/bla/foo/ <file1 >X &&
        rm file1 &&
        mv X file1 &&
@@ -56,7 +56,7 @@ Even more" > file2 &&
 
        # Try to merge into foo again
        git checkout foo &&
-       if git merge master; then
+       if git merge main; then
                echo needed conflict here
                exit 1
        else

diff --git a/t/t8012-blame-colors.sh b/t/t8012-blame-colors.sh
index d55b3e22c92509ae0153ba97f10ee07d53bc80c1..90c75dbb283fce796847f51546a04691e0521de8 100755 (executable)
--- a/t/t8012-blame-colors.sh
+++ b/t/t8012-blame-colors.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 test_description='colored git blame'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh