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>maint
Johannes Schindelin
Junio C Hamano
parent
a881baa2c3
commit
765577b5d0
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
'
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
'
|
||||
|
||||
|
|
|
|||
|
|
@ -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 &&
|
||||
|
|
|
|||
Loading…
Reference in New Issue