Merge branch 'pb/blame-funcname-range-userdiff'

[thirdparty/git.git] / t / annotate-tests.sh

diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index 3aee61d2cc1fa6bc97976fff30d3516f55abab80..29ce89090d8554a1766c31e9b90cbb387d45c6f7 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' '
@@ -483,12 +483,12 @@ test_expect_success 'setup -L :funcname with userdiff driver' '
        echo "fortran-* diff=fortran" >.gitattributes &&
        fortran_file=fortran-external-function &&
        orig_file="$TEST_DIRECTORY/t4018/$fortran_file" &&
-       cp $orig_file . &&
-       git add $fortran_file &&
+       cp "$orig_file" . &&
+       git add "$fortran_file" &&
        GIT_AUTHOR_NAME="A" GIT_AUTHOR_EMAIL="A@test.git" \
        git commit -m "add fortran file" &&
-       sed -e "s/ChangeMe/IWasChanged/" <"$orig_file" >$fortran_file &&
-       git add $fortran_file &&
+       sed -e "s/ChangeMe/IWasChanged/" <"$orig_file" >"$fortran_file" &&
+       git add "$fortran_file" &&
        GIT_AUTHOR_NAME="B" GIT_AUTHOR_EMAIL="B@test.git" \
        git commit -m "change fortran file"
 '