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>
This commit is contained in:
committed by
Junio C Hamano
parent
a881baa2c3
commit
765577b5d0
@ -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'
|
||||
|
||||
|
||||
Reference in New Issue
Block a user