summaryrefslogtreecommitdiff
path: root/t/t6060-merge-index.sh
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2020-12-17 01:07:07 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-12-16 17:41:41 -0800
commit72dc172804fc26a8be5b2805bb47c8773635d558 (patch)
tree3afafa5c621bbd38d8a859eed4e29732c1f9a4f2 /t/t6060-merge-index.sh
parentt5510: use `main` as initial branch name (diff)
downloadtgif-72dc172804fc26a8be5b2805bb47c8773635d558.tar.xz
t5703: use `main` as initial branch name
In 97cf8d50b59 (t5703: adjust a test case for the upcoming default branch name, 2020-10-23), we prepared this test script for a world when the default initial branch name would be `main`. However, there is no need to wait for that: let's adjust the test script to stop relying on a specific initial branch name by setting it explicitly. This allows us to drop the `PREPARE_FOR_MAIN_BRANCH` prereq from one test case. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6060-merge-index.sh')
0 files changed, 0 insertions, 0 deletions