Skip to content

Commit 5d5f4ea

Browse files
dschogitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent a9568db commit 5d5f4ea

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

t/t5411-proc-receive-hook.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,11 @@
55

66
test_description='Test proc-receive hook'
77

8-
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
8+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
99
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
1010

1111
. ./test-lib.sh
1212

13-
test_have_prereq PREPARE_FOR_MAIN_BRANCH || {
14-
test_skip="In transit for the default branch name 'main'"
15-
test_done
16-
}
17-
1813
. "$TEST_DIRECTORY"/t5411/common-functions.sh
1914

2015
setup_upstream_and_workbench () {

t/t5411/once-0010-report-status-v1.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ test_expect_success "proc-receive: report status v1" '
6969
proc-receive> option forced-update
7070
proc-receive> ng refs/for/next/topic target branch not exist
7171
000eunpack ok
72-
0019ok refs/heads/main
73-
001eok refs/for/main/topic1
72+
0017ok refs/heads/main
73+
001cok refs/for/main/topic1
7474
0016ok refs/heads/foo
7575
0033ng refs/for/next/topic target branch not exist
76-
001eok refs/for/main/topic2
76+
001cok refs/for/main/topic2
7777
0000# post-receive hook
7878
post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
7979
post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic1

0 commit comments

Comments
 (0)