Browse Source

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>
maint
Johannes Schindelin 4 years ago committed by Junio C Hamano
parent
commit
747f6c6805
  1. 8
      t/annotate-tests.sh
  2. 4
      t/t8001-annotate.sh
  3. 2
      t/t8002-blame.sh
  4. 6
      t/t8003-blame-corner-cases.sh
  5. 16
      t/t8004-blame-with-conflicts.sh
  6. 2
      t/t8012-blame-colors.sh

8
t/annotate-tests.sh

@ -95,7 +95,7 @@ test_expect_success 'blame 2 authors' ' @@ -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' ' @@ -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' ' @@ -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' '

4
t/t8001-annotate.sh

@ -1,7 +1,7 @@ @@ -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' @@ -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)

2
t/t8002-blame.sh

@ -1,7 +1,7 @@ @@ -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

6
t/t8003-blame-corner-cases.sh

@ -1,7 +1,7 @@ @@ -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' ' @@ -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 &&

16
t/t8004-blame-with-conflicts.sh

@ -3,7 +3,7 @@ @@ -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' ' @@ -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 && @@ -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 && @@ -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

2
t/t8012-blame-colors.sh

@ -1,7 +1,7 @@ @@ -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

Loading…
Cancel
Save