From: Johannes Schindelin <johannes.schindelin@xxxxxx>
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@xxxxxx>
---
t/t5411-proc-receive-hook.sh | 8 +++-----
t/t5411/once-0010-report-status-v1.sh | 6 +++---
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/t/t5411-proc-receive-hook.sh b/t/t5411-proc-receive-hook.sh
index 06bbb02ed2..98b0e81208 100755
--- a/t/t5411-proc-receive-hook.sh
+++ b/t/t5411-proc-receive-hook.sh
@@ -5,12 +5,10 @@
test_description='Test proc-receive hook'
-. ./test-lib.sh
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-test_have_prereq PREPARE_FOR_MAIN_BRANCH || {
- test_skip="In transit for the default branch name 'main'"
- test_done
-}
+. ./test-lib.sh
. "$TEST_DIRECTORY"/t5411/common-functions.sh
diff --git a/t/t5411/once-0010-report-status-v1.sh b/t/t5411/once-0010-report-status-v1.sh
index 6005ee0ecb..cb431a9c91 100644
--- a/t/t5411/once-0010-report-status-v1.sh
+++ b/t/t5411/once-0010-report-status-v1.sh
@@ -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
--
gitgitgadget
