diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-10-31 19:46:03 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-10-31 13:15:17 -0700 |
| commit | 5d5f4ea30def2ac765c5517f768366524768c110 (patch) | |
| tree | 4a4c7789ead92ee7848c5c7bf5b64c36f5f2da1b /t | |
| parent | t5411: adjust the remaining support files for init.defaultBranch=main (diff) | |
| download | tgif-5d5f4ea30def2ac765c5517f768366524768c110.tar.xz | |
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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5411-proc-receive-hook.sh | 7 | ||||
| -rw-r--r-- | t/t5411/once-0010-report-status-v1.sh | 6 |
2 files changed, 4 insertions, 9 deletions
diff --git a/t/t5411-proc-receive-hook.sh b/t/t5411-proc-receive-hook.sh index 6da6f597a5..98b0e81208 100755 --- a/t/t5411-proc-receive-hook.sh +++ b/t/t5411-proc-receive-hook.sh @@ -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 () { 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 |