t6[4-9]*: adjust the references to the default branch name "main"
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Wed, 18 Nov 2020 23:44:38 +0000 (23:44 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 19 Nov 2020 23:44:18 +0000 (15:44 -0800)
commit5902f5f4608c1857fc04dcae2a0ce6beea31c8f8
tree9a56000f293ef84871a419a00bb7a3abdcda6706
parent1f53df54eba378eee544b47f7c9e7f5fc32873e1
t6[4-9]*: adjust the references to the default branch name "main"

This trick was performed via

$ (cd t &&
   sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \
-e 's/Master/Main/g' -- t6[4-9]*.sh)

This allows us to define `GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main`
for those tests.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
27 files changed:
t/t6400-merge-df.sh
t/t6402-merge-rename.sh
t/t6404-recursive-merge.sh
t/t6405-merge-symlinks.sh
t/t6406-merge-attr.sh
t/t6407-merge-binary.sh
t/t6409-merge-subtree.sh
t/t6411-merge-filemode.sh
t/t6412-merge-large-rename.sh
t/t6413-merge-crlf.sh
t/t6414-merge-rename-nocruft.sh
t/t6415-merge-dir-to-symlink.sh
t/t6416-recursive-corner-cases.sh
t/t6417-merge-ours-theirs.sh
t/t6418-merge-text-auto.sh
t/t6419-merge-ignorecase.sh
t/t6422-merge-rename-corner-cases.sh
t/t6425-merge-rename-delete.sh
t/t6427-diff3-conflict-markers.sh
t/t6430-merge-recursive.sh
t/t6432-merge-recursive-space-options.sh
t/t6433-merge-toplevel.sh
t/t6434-merge-recursive-rename-options.sh
t/t6436-merge-overwrite.sh
t/t6437-submodule-merge.sh
t/t6439-merge-co-error-msgs.sh
t/t6501-freshen-objects.sh