t7[0-4]*: adjust the references to the default branch name "main"
Carefully excluding t7064, which sees independent development elsewhere at the time of writing, we use `main` as the default branch name in t7[0-4]*. This trick was performed via $ (cd t && sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \ -e 's/Master/Main/g' -- t7[0-4]*.sh && git checkout HEAD -- t7064\*) 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
5902f5f460
commit
01dc81336d
@ -2,7 +2,7 @@
|
||||
|
||||
test_description='post index change hook'
|
||||
|
||||
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
|
||||
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
||||
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
||||
|
||||
. ./test-lib.sh
|
||||
@ -88,7 +88,7 @@ test_expect_success 'test checkout and reset trigger the hook' '
|
||||
EOF
|
||||
: force index to be dirty &&
|
||||
test-tool chmtime +60 dir1/file1.txt &&
|
||||
git checkout master &&
|
||||
git checkout main &&
|
||||
test_path_is_file testsuccess && rm -f testsuccess &&
|
||||
test_path_is_missing testfailure &&
|
||||
test-tool chmtime +60 dir1/file1.txt &&
|
||||
|
Reference in New Issue
Block a user