diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-11-02 13:17:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-02 13:17:46 -0800 |
| commit | 596ad33080472653faa03763b1e0f3a6787e25d4 (patch) | |
| tree | 5cebe3f44f06b7b2b6ffa8b965847a67f2496e33 /t/test-lib.sh | |
| parent | 292e53fa9d2cf6d0b6d6adbbdc6dfc665bd4babe (diff) | |
| parent | 3224b0f0bb7bc90c0156e73c58f1d2e770f0ad7c (diff) | |
| download | git-596ad33080472653faa03763b1e0f3a6787e25d4.tar.gz | |
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/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index f68bca745a..6bc0a30d38 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1705,3 +1705,10 @@ test_lazy_prereq SHA1 ' test_lazy_prereq REBASE_P ' test -z "$GIT_TEST_SKIP_REBASE_P" ' +# Special-purpose prereq for transitioning to a new default branch name: +# Some tests need more than just a mindless (case-preserving) s/master/main/g +# replacement. The non-trivial adjustments are guarded behind this +# prerequisite, acting kind of as a feature flag +test_lazy_prereq PREPARE_FOR_MAIN_BRANCH ' + test "$GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME" = main +' |