diff options
| -rwxr-xr-x | t/t5515-fetch-merge-logic.sh | 7 |
1 files changed, 1 insertions, 6 deletions
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 |