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>
Johannes Schindelin committed
Oct 31, 2020 at 19:46 UTC
5d5f4ea30def2ac765c5517f768366524768c110
2 files changed
+4
-9
t/t5411-proc-receive-hook.sh
+1
-6
@@ -5,16 +5,11 @@
5
6
test_description='Test proc-receive hook'
7
8
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
8
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
9
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
10
11
. ./test-lib.sh
12
13
-test_have_prereq PREPARE_FOR_MAIN_BRANCH || {
14
- test_skip="In transit for the default branch name 'main'"
15
- test_done
16
-}
17
-
13
. "$TEST_DIRECTORY"/t5411/common-functions.sh
14
15
setup_upstream_and_workbench () {
t/t5411/once-0010-report-status-v1.sh
+3
-3
@@ -69,11 +69,11 @@ test_expect_success "proc-receive: report status v1" '
69
proc-receive> option forced-update
70
proc-receive> ng refs/for/next/topic target branch not exist
71
000eunpack ok
72
- 0019ok refs/heads/main
73
- 001eok refs/for/main/topic1
72
+ 0017ok refs/heads/main
73
+ 001cok refs/for/main/topic1
74
0016ok refs/heads/foo
75
0033ng refs/for/next/topic target branch not exist
76
- 001eok refs/for/main/topic2
76
+ 001cok refs/for/main/topic2
77
0000# post-receive hook
78
post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
79
post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic1