]> git.ipfire.org Git - thirdparty/git.git/commit
t5515: use `main` as the name of the main branch for testing (conclusion)
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Mon, 2 Nov 2020 23:55:07 +0000 (23:55 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Nov 2020 00:40:58 +0000 (16:40 -0800)
commitf74e3f79c5559b20ad1e6cde6ed2f021bbc64c55
tree8c2b2bda1c013179a4a9f846ef3cee7acaa6e818
parent70bc132c96846a2fe96b9674055338892d71bbb5
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>
t/t5515-fetch-merge-logic.sh