diff mbox series

[4/4] t5515: use `main` as the name of the main branch for testing (conclusion)

Message ID 3704ecd9a82ae9d8fb705dd179b9ad2c9240d04d.1604361307.git.gitgitgadget@gmail.com (mailing list archive)
State Accepted
Commit f74e3f79c5559b20ad1e6cde6ed2f021bbc64c55
Headers show
Series Adjust t5515 for the upcoming change of the default branch name | expand

Commit Message

Johannes Schindelin Nov. 2, 2020, 11:55 p.m. UTC 
From: Johannes Schindelin <johannes.schindelin@gmx.de>

In the previous three commits, We prepared the `t5515` script and the
files in `t/t5515/` for the upcoming change of the default branch name
to `main`. The changes were made over the course of three commits
because the overall patch would have been too big to send to the Git
mailing list for review.

Naturally, the test could not pass in the transitional stages and was
therefore disabled via the `PREPARE_FOR_MAIN_BRANCH` prereq. Now that
the transition is complete, we can re-enable it.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t5515-fetch-merge-logic.sh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh
index 1a81991cf7..50f14101c5 100755
--- a/t/t5515-fetch-merge-logic.sh
+++ b/t/t5515-fetch-merge-logic.sh
@@ -11,16 +11,11 @@  test_description='Merge logic in fetch'
 GIT_TEST_PROTOCOL_VERSION=0
 export GIT_TEST_PROTOCOL_VERSION
 
-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
-}
-
 build_script () {
 	script="$1" &&
 	for i in one three_file main topic_2 one_tree three two two2 three2