kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

t5411: finish preparing for `main` being the default branch name 

In addition to the trivial search-and-replace performed over the course
of the previous three commits, there is one test in t5411 that depends
on the length of the default branch name.

Adjust it and use `main` as the default branch name in this test.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Johannes Schindelin 2020-10-31 19:46:03 +00:00 committed by Junio C Hamano
parent a9568dba41
commit 5d5f4ea30d
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
t/t5411-proc-receive-hook.sh
View File

@ -5,16 +5,11 @@

test_description='Test proc-receive 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

test_have_prereq PREPARE_FOR_MAIN_BRANCH || {
test_skip="In transit for the default branch name 'main'"
test_done
}

. "$TEST_DIRECTORY"/t5411/common-functions.sh

setup_upstream_and_workbench () {

6
t/t5411/once-0010-report-status-v1.sh
View File

@ -69,11 +69,11 @@ test_expect_success "proc-receive: report status v1" '
proc-receive> option forced-update
proc-receive> ng refs/for/next/topic target branch not exist
000eunpack ok
0019ok refs/heads/main
001eok refs/for/main/topic1
0017ok refs/heads/main
001cok refs/for/main/topic1
0016ok refs/heads/foo
0033ng refs/for/next/topic target branch not exist
001eok refs/for/main/topic2
001cok refs/for/main/topic2
0000# post-receive hook
post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic1