t5515: use `main` as the name of the main branch for testing (conclusion)
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Nov 2, 2020 at 23:55 UTC
f74e3f79c5559b20ad1e6cde6ed2f021bbc64c55
1 file changed
+1
-6
t/t5515-fetch-merge-logic.sh
+1
-6
@@ -11,16 +11,11 @@ test_description='Merge logic in fetch'
11
GIT_TEST_PROTOCOL_VERSION=0
12
export GIT_TEST_PROTOCOL_VERSION
13
14
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
14
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
15
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
16
17
. ./test-lib.sh
18
19
-test_have_prereq PREPARE_FOR_MAIN_BRANCH || {
20
- test_skip="In transit for the default branch name 'main'"
21
- test_done
22
-}
23
-
19
build_script () {
20
script="$1" &&
21
for i in one three_file main topic_2 one_tree three two two2 three2