diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-11-03 00:17:46 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-03 00:17:46 +0300 |
| commit | 596ad33080472653faa03763b1e0f3a6787e25d4 (patch) | |
| tree | 5cebe3f44f06b7b2b6ffa8b965847a67f2496e33 /t/t5606-clone-options.sh | |
| parent | 292e53fa9d2cf6d0b6d6adbbdc6dfc665bd4babe (diff) | |
| parent | 3224b0f0bb7bc90c0156e73c58f1d2e770f0ad7c (diff) | |
Merge branch 'js/default-branch-name-part-4-minus-1'
Adjust tests so that they won't scream when the default initial
branch name is changed to 'main'.
* js/default-branch-name-part-4-minus-1:
t1400: prepare for `main` being default branch name
tests: prepare aligned mentions of the default branch name
t9902: prepare a test for the upcoming default branch name
t3200: prepare for `main` being shorter than `master`
t5703: adjust a test case for the upcoming default branch name
t6200: adjust suppression pattern to also match "main"
tests: start moving to a different default main branch name
t9801: use `--` in preparation for default branch rename
fmt-merge-msg: also suppress "into main" by default
Diffstat (limited to 't/t5606-clone-options.sh')
| -rwxr-xr-x | t/t5606-clone-options.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/t/t5606-clone-options.sh b/t/t5606-clone-options.sh index 5e201e7d85..7f082fb23b 100755 --- a/t/t5606-clone-options.sh +++ b/t/t5606-clone-options.sh @@ -103,6 +103,7 @@ test_expect_success 'redirected clone -v does show progress' ' test_expect_success 'chooses correct default initial branch name' ' git init --bare empty && + GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \ git -c init.defaultBranch=up clone empty whats-up && test refs/heads/up = $(git -C whats-up symbolic-ref HEAD) && test refs/heads/up = $(git -C whats-up config branch.up.merge) @@ -117,9 +118,11 @@ test_expect_success 'guesses initial branch name correctly' ' git -c init.defaultBranch=none init --bare no-head && git -C initial-branch push ../no-head guess abc && + GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \ git clone no-head is-it2 && test_must_fail git -C is-it2 symbolic-ref refs/remotes/origin/HEAD && git -C no-head update-ref --no-deref HEAD refs/heads/guess && + GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \ git -c init.defaultBranch=guess clone no-head is-it3 && test refs/remotes/origin/guess = \ $(git -C is-it3 symbolic-ref refs/remotes/origin/HEAD) |