t9[5-7]*: 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' -- t9[5-7]*.sh lib-cvs.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/lib-cvs.sh b/t/lib-cvs.sh
index 9b2bcfb1b0e38ec75e4d6d772e530a69eaaad874..32b34733790834362612816eb5eac63cc6acdf33 100644 (file)
--- a/t/lib-cvs.sh
+++ b/t/lib-cvs.sh
@@ -36,7 +36,7 @@ setup_cvs_test_repository () {
 test_cvs_co () {
        # Usage: test_cvs_co BRANCH_NAME
        rm -rf module-cvs-"$1"
-       if [ "$1" = "master" ]
+       if [ "$1" = "main" ]
        then
                $CVS co -P -d module-cvs-"$1" -A module
        else

diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh
index fa36bf5e83e419c23a7edfab20df1d802b22f7ae..ee8c6e30e67f5b969bd32889f3f57a1e11771e90 100755 (executable)
--- a/t/t9500-gitweb-standalone-no-errors.sh
+++ b/t/t9500-gitweb-standalone-no-errors.sh
@@ -10,7 +10,7 @@ commandline, and checks that it would not write any errors
 or warnings to log.'
 
 
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./gitweb-lib.sh
@@ -330,7 +330,7 @@ test_expect_success \
         echo "Branch" >>b &&
         git add b &&
         git commit -a -m "On branch" &&
-        git checkout master &&
+        git checkout main &&
         git merge b &&
         git tag merge_commit'
 
@@ -367,7 +367,7 @@ test_expect_success \
         echo "Changed and have mode changed" >07-change-mode-change &&
         test_chmod +x 07-change-mode-change &&
         git commit -a -m "Large commit" &&
-        git checkout master'
+        git checkout main'
 
 test_expect_success \
        'commit(1): large commit' \
@@ -405,7 +405,7 @@ test_expect_success 'side-by-side: merge commit' '
 
 test_expect_success \
        'tags: list of different types of tags' \
-       'git checkout master &&
+       'git checkout main &&
         git tag -a -m "Tag commit object" tag-commit HEAD &&
         git tag -a -m "" tag-commit-nomessage HEAD &&
         git tag -a -m "Tag tag object" tag-tag tag-commit &&
@@ -446,7 +446,7 @@ test_expect_success \
 
 test_expect_success \
        'logs: history (implicit HEAD, deleted file)' \
-       'git checkout master &&
+       'git checkout main &&
         echo "to be deleted" >deleted_file &&
         git add deleted_file &&
         git commit -m "Add file to be deleted" &&
@@ -466,11 +466,11 @@ test_expect_success \
 
 test_expect_success \
        'path_info: project/branch:file' \
-       'gitweb_run "" "/.git/master:file"'
+       'gitweb_run "" "/.git/main:file"'
 
 test_expect_success \
        'path_info: project/branch:dir/' \
-       'gitweb_run "" "/.git/master:foo/"'
+       'gitweb_run "" "/.git/main:foo/"'
 
 test_expect_success \
        'path_info: project/branch (non-existent)' \
@@ -482,16 +482,16 @@ test_expect_success \
 
 test_expect_success \
        'path_info: project/branch:file (non-existent)' \
-       'gitweb_run "" "/.git/master:non-existent"'
+       'gitweb_run "" "/.git/main:non-existent"'
 
 test_expect_success \
        'path_info: project/branch:dir/ (non-existent)' \
-       'gitweb_run "" "/.git/master:non-existent/"'
+       'gitweb_run "" "/.git/main:non-existent/"'
 
 
 test_expect_success \
        'path_info: project/branch:/file' \
-       'gitweb_run "" "/.git/master:/file"'
+       'gitweb_run "" "/.git/main:/file"'
 
 test_expect_success \
        'path_info: project/:/file (implicit HEAD)' \
@@ -804,7 +804,7 @@ test_expect_success \
                git checkout orphan_branch ||
                git checkout --orphan orphan_branch
         } &&
-        test_when_finished "git checkout master" &&
+        test_when_finished "git checkout main" &&
         gitweb_run "p=.git;a=summary"'
 
 test_done

diff --git a/t/t9501-gitweb-standalone-http-status.sh b/t/t9501-gitweb-standalone-http-status.sh
index 6b0adf28d280ae340b6ec80818c23ce467005dbb..141610de5464882eb660133d80ceb65df7323b17 100755 (executable)
--- a/t/t9501-gitweb-standalone-http-status.sh
+++ b/t/t9501-gitweb-standalone-http-status.sh
@@ -10,7 +10,7 @@ commandline, and checks that it returns the expected HTTP status
 code and message.'
 
 
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./gitweb-lib.sh
@@ -88,7 +88,7 @@ test_debug 'cat gitweb.headers'
 # snapshot hash ids
 
 test_expect_success 'snapshots: good tree-ish id' '
-       gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" &&
+       gitweb_run "p=.git;a=snapshot;h=main;sf=tgz" &&
        grep "Status: 200 OK" gitweb.output
 '
 test_debug 'cat gitweb.headers'
@@ -126,7 +126,7 @@ test_debug 'cat gitweb.output'
 # modification times (Last-Modified and If-Modified-Since)
 
 test_expect_success DATE_PARSER 'modification: feed last-modified' '
-       gitweb_run "p=.git;a=atom;h=master" &&
+       gitweb_run "p=.git;a=atom;h=main" &&
        grep "Status: 200 OK" gitweb.headers &&
        grep "Last-modified: Thu, 7 Apr 2005 22:14:13 +0000" gitweb.headers
 '
@@ -136,7 +136,7 @@ test_expect_success DATE_PARSER 'modification: feed if-modified-since (modified)
        HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
        export HTTP_IF_MODIFIED_SINCE &&
        test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
-       gitweb_run "p=.git;a=atom;h=master" &&
+       gitweb_run "p=.git;a=atom;h=main" &&
        grep "Status: 200 OK" gitweb.headers
 '
 test_debug 'cat gitweb.headers'
@@ -145,13 +145,13 @@ test_expect_success DATE_PARSER 'modification: feed if-modified-since (unmodifie
        HTTP_IF_MODIFIED_SINCE="Thu, 7 Apr 2005 22:14:13 +0000" &&
        export HTTP_IF_MODIFIED_SINCE &&
        test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
-       gitweb_run "p=.git;a=atom;h=master" &&
+       gitweb_run "p=.git;a=atom;h=main" &&
        grep "Status: 304 Not Modified" gitweb.headers
 '
 test_debug 'cat gitweb.headers'
 
 test_expect_success DATE_PARSER 'modification: snapshot last-modified' '
-       gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" &&
+       gitweb_run "p=.git;a=snapshot;h=main;sf=tgz" &&
        grep "Status: 200 OK" gitweb.headers &&
        grep "Last-modified: Thu, 7 Apr 2005 22:14:13 +0000" gitweb.headers
 '
@@ -161,7 +161,7 @@ test_expect_success DATE_PARSER 'modification: snapshot if-modified-since (modif
        HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
        export HTTP_IF_MODIFIED_SINCE &&
        test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
-       gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" &&
+       gitweb_run "p=.git;a=snapshot;h=main;sf=tgz" &&
        grep "Status: 200 OK" gitweb.headers
 '
 test_debug 'cat gitweb.headers'
@@ -170,7 +170,7 @@ test_expect_success DATE_PARSER 'modification: snapshot if-modified-since (unmod
        HTTP_IF_MODIFIED_SINCE="Thu, 7 Apr 2005 22:14:13 +0000" &&
        export HTTP_IF_MODIFIED_SINCE &&
        test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
-       gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" &&
+       gitweb_run "p=.git;a=snapshot;h=main;sf=tgz" &&
        grep "Status: 304 Not Modified" gitweb.headers
 '
 test_debug 'cat gitweb.headers'

diff --git a/t/t9502-gitweb-standalone-parse-output.sh b/t/t9502-gitweb-standalone-parse-output.sh
index 76d90eccd8c29d7f82b676d8eec1c31110c1b20e..9cf7ab30a8d8f824088a02ddd646fb7a6a881378 100755 (executable)
--- a/t/t9502-gitweb-standalone-parse-output.sh
+++ b/t/t9502-gitweb-standalone-parse-output.sh
@@ -10,7 +10,7 @@ commandline, and checks that it produces the correct output, either
 in the HTTP header or the actual script output.'
 
 
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./gitweb-lib.sh
@@ -82,10 +82,10 @@ test_expect_success 'snapshot: HEAD' '
 '
 test_debug 'cat gitweb.headers && cat file_list'
 
-test_expect_success 'snapshot: short branch name (master)' '
-       gitweb_run "p=.git;a=snapshot;h=master;sf=tar" &&
-       ID=$(git rev-parse --verify --short=7 master) &&
-       check_snapshot ".git-master-$ID"
+test_expect_success 'snapshot: short branch name (main)' '
+       gitweb_run "p=.git;a=snapshot;h=main;sf=tar" &&
+       ID=$(git rev-parse --verify --short=7 main) &&
+       check_snapshot ".git-main-$ID"
 '
 test_debug 'cat gitweb.headers && cat file_list'
 
@@ -96,10 +96,10 @@ test_expect_success 'snapshot: short tag name (first)' '
 '
 test_debug 'cat gitweb.headers && cat file_list'
 
-test_expect_success 'snapshot: full branch name (refs/heads/master)' '
-       gitweb_run "p=.git;a=snapshot;h=refs/heads/master;sf=tar" &&
-       ID=$(git rev-parse --verify --short=7 master) &&
-       check_snapshot ".git-master-$ID"
+test_expect_success 'snapshot: full branch name (refs/heads/main)' '
+       gitweb_run "p=.git;a=snapshot;h=refs/heads/main;sf=tar" &&
+       ID=$(git rev-parse --verify --short=7 main) &&
+       check_snapshot ".git-main-$ID"
 '
 test_debug 'cat gitweb.headers && cat file_list'
 

diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
index 9257d664f20174f8baa4c8f9262dbc7d995839ed..568084921896cfc59c04d68814467d6f7443a75e 100755 (executable)
--- a/t/t9600-cvsimport.sh
+++ b/t/t9600-cvsimport.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 test_description='git cvsimport basic tests'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./lib-cvs.sh
@@ -162,6 +162,6 @@ test_expect_success PERL 'no .git/cvs-revisions created by default' '
 
 '
 
-test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master'
+test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree main'
 
 test_done

diff --git a/t/t9601-cvsimport-vendor-branch.sh b/t/t9601-cvsimport-vendor-branch.sh
index 700c2688d2c777f9d372b81fa2622637168780c3..116cddba3a5da871d078a50f3559d40fbb208102 100755 (executable)
--- a/t/t9601-cvsimport-vendor-branch.sh
+++ b/t/t9601-cvsimport-vendor-branch.sh
@@ -32,7 +32,7 @@
 #       tag has been removed.
 
 test_description='git cvsimport handling of vendor branches'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./lib-cvs.sh
@@ -45,43 +45,43 @@ test_expect_success PERL 'import a module with a vendor branch' '
 
 '
 
-test_expect_success PERL 'check HEAD out of cvs repository' 'test_cvs_co master'
+test_expect_success PERL 'check HEAD out of cvs repository' 'test_cvs_co main'
 
-test_expect_success PERL 'check master out of git repository' 'test_git_co master'
+test_expect_success PERL 'check main out of git repository' 'test_git_co main'
 
 test_expect_success PERL 'check a file that was imported once' '
 
-       test_cmp_branch_file master imported-once.txt
+       test_cmp_branch_file main imported-once.txt
 
 '
 
 test_expect_failure PERL 'check a file that was imported twice' '
 
-       test_cmp_branch_file master imported-twice.txt
+       test_cmp_branch_file main imported-twice.txt
 
 '
 
 test_expect_success PERL 'check a file that was imported then modified on HEAD' '
 
-       test_cmp_branch_file master imported-modified.txt
+       test_cmp_branch_file main imported-modified.txt
 
 '
 
 test_expect_success PERL 'check a file that was imported, modified, then imported again' '
 
-       test_cmp_branch_file master imported-modified-imported.txt
+       test_cmp_branch_file main imported-modified-imported.txt
 
 '
 
 test_expect_success PERL 'check a file that was added to HEAD then imported' '
 
-       test_cmp_branch_file master added-imported.txt
+       test_cmp_branch_file main added-imported.txt
 
 '
 
 test_expect_success PERL 'a vendor branch whose tag has been removed' '
 
-       test_cmp_branch_file master imported-anonymously.txt
+       test_cmp_branch_file main imported-anonymously.txt
 
 '
 

diff --git a/t/t9602-cvsimport-branches-tags.sh b/t/t9602-cvsimport-branches-tags.sh
index 7b1fb36e67d103f9b661217863a4196336a3ff0b..e5266c9a872f15a9649d4f0532d823b86e50aeb6 100755 (executable)
--- a/t/t9602-cvsimport-branches-tags.sh
+++ b/t/t9602-cvsimport-branches-tags.sh
@@ -4,7 +4,7 @@
 # t9602/README.
 
 test_description='git cvsimport handling of branches and tags'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./lib-cvs.sh
@@ -17,9 +17,9 @@ test_expect_success PERL 'import module' '
 
 '
 
-test_expect_success PERL 'test branch master' '
+test_expect_success PERL 'test branch main' '
 
-       test_cmp_branch_tree master
+       test_cmp_branch_tree main
 
 '
 

diff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh
index 87cd8c0c6be4661716c353b2e8c5c48d64fe2d13..0e9daa5768c4c1cfd650bb2b552d4d6694bbe014 100755 (executable)
--- a/t/t9603-cvsimport-patchsets.sh
+++ b/t/t9603-cvsimport-patchsets.sh
@@ -12,7 +12,7 @@
 # bug.
 
 test_description='git cvsimport testing for correct patchset estimation'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./lib-cvs.sh
@@ -23,16 +23,16 @@ test_expect_failure PERL 'import with criss cross times on revisions' '
        git cvsimport -p"-x" -C module-git module &&
        (
                cd module-git &&
-               git log --pretty=format:%s > ../actual-master &&
+               git log --pretty=format:%s > ../actual-main &&
                git log A~2..A --pretty="format:%s %ad" -- > ../actual-A &&
-               echo "" >> ../actual-master &&
+               echo "" >> ../actual-main &&
                echo "" >> ../actual-A
        ) &&
        echo "Rev 4
 Rev 3
 Rev 2
-Rev 1" > expect-master &&
-       test_cmp expect-master actual-master &&
+Rev 1" > expect-main &&
+       test_cmp expect-main actual-main &&
 
        echo "Rev 5 Branch A Wed Mar 11 19:09:10 2009 +0000
 Rev 4 Branch A Wed Mar 11 19:03:52 2009 +0000" > expect-A &&