[2/4] t5515: use `main` as the name of the main branch for testing (part 2)

From: Johannes Schindelin <johannes.schindelin@gmx.de>

From: Johannes Schindelin <johannes.schindelin@gmx.de>

We just started preparing t5515 for the upcoming change of the default
branch name to `main`. This patch adjusts roughly half of the supporting
material in `t/t5515/` (the patch adjusting all of `t/t5515/` would have
weighed more than 100kB and therefore not made it to the Git mailing
list for review).

Similar to what we did for the `t5515` script itself in the previous
commit, this patch was generated via:

    sed -i -e 's/master/main/g' -e 's/Master/Main/g' \
        -e 's/6c9dec2b923228c9ff994c6cfe4ae16c12408dc5/ecf3b3627b498bdcb735cc4343bf165f76964e9a/g' \
	-e 's/8521c3072461fcfe8f32d67f95cc6e6b832a2db2fa29769ffc788bce85ebcd75/fff666109892bb4b1c80cd1649d2d8762a0663db8b5d46c8be98360b64fbba5f/g' \
	-e 's/754b754407bf032e9a2f9d5a9ad05ca79a6b228f/b4ab76b1a01ea602209932134a44f1e6bd610832/g' \
	-e 's/6c7abaea8a6d8ef4d89877e68462758dc6774690fbbbb0e6d7dd57415c9abde0/380ebae0113f877ce46fcdf39d5bc33e4dc0928db5c5a4d5fdc78381c4d55ae3/g' \
	-- t/t5515/fetch.*

In addition to that, we need to adjust some file _names_ in `t/t5515/`
because they encode the branch name:

    eval "$(git ls-files t/t5515/fetch.\* | sed -n \
	-e 's/\(.*\)master\(.*\)/git mv & \1main\2;/p')"

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t5515/fetch.br-branches-default                     |  4 ++--
 t/t5515/fetch.br-branches-default-merge               |  4 ++--
 .../fetch.br-branches-default-merge_branches-default  |  4 ++--
 t/t5515/fetch.br-branches-default-octopus             |  4 ++--
 ...fetch.br-branches-default-octopus_branches-default |  4 ++--
 t/t5515/fetch.br-branches-default_branches-default    |  4 ++--
 t/t5515/fetch.br-branches-one                         |  2 +-
 t/t5515/fetch.br-branches-one-merge                   |  2 +-
 t/t5515/fetch.br-branches-one-merge_branches-one      |  2 +-
 t/t5515/fetch.br-branches-one-octopus                 |  2 +-
 t/t5515/fetch.br-branches-one-octopus_branches-one    |  2 +-
 t/t5515/fetch.br-branches-one_branches-one            |  2 +-
 t/t5515/fetch.br-config-explicit                      |  4 ++--
 t/t5515/fetch.br-config-explicit-merge                |  4 ++--
 .../fetch.br-config-explicit-merge_config-explicit    |  4 ++--
 t/t5515/fetch.br-config-explicit-octopus              |  4 ++--
 .../fetch.br-config-explicit-octopus_config-explicit  |  4 ++--
 t/t5515/fetch.br-config-explicit_config-explicit      |  4 ++--
 t/t5515/fetch.br-config-glob                          |  4 ++--
 t/t5515/fetch.br-config-glob-merge                    |  4 ++--
 t/t5515/fetch.br-config-glob-merge_config-glob        |  4 ++--
 t/t5515/fetch.br-config-glob-octopus                  |  4 ++--
 t/t5515/fetch.br-config-glob-octopus_config-glob      |  4 ++--
 t/t5515/fetch.br-config-glob_config-glob              |  4 ++--
 t/t5515/fetch.br-remote-explicit                      |  4 ++--
 t/t5515/fetch.br-remote-explicit-merge                |  4 ++--
 .../fetch.br-remote-explicit-merge_remote-explicit    |  4 ++--
 t/t5515/fetch.br-remote-explicit-octopus              |  4 ++--
 .../fetch.br-remote-explicit-octopus_remote-explicit  |  4 ++--
 t/t5515/fetch.br-remote-explicit_remote-explicit      |  4 ++--
 t/t5515/fetch.br-remote-glob                          |  4 ++--
 t/t5515/fetch.br-remote-glob-merge                    |  4 ++--
 t/t5515/fetch.br-remote-glob-merge_remote-glob        |  4 ++--
 t/t5515/fetch.br-remote-glob-octopus                  |  4 ++--
 t/t5515/fetch.br-remote-glob-octopus_remote-glob      |  4 ++--
 t/t5515/fetch.br-remote-glob_remote-glob              |  4 ++--
 t/t5515/fetch.br-unconfig                             |  4 ++--
 t/t5515/fetch.br-unconfig_--tags_.._.git              |  2 +-
 ...nconfig_.._.git_one_tag_tag-one_tag_tag-three-file |  2 +-
 ...config_.._.git_tag_tag-one-tree_tag_tag-three-file |  2 +-
 ...etch.br-unconfig_.._.git_tag_tag-one_tag_tag-three |  2 +-
 t/t5515/fetch.br-unconfig_branches-default            |  4 ++--
 t/t5515/fetch.br-unconfig_branches-one                |  2 +-
 t/t5515/fetch.br-unconfig_config-explicit             |  4 ++--
 t/t5515/fetch.br-unconfig_config-glob                 |  4 ++--
 t/t5515/fetch.br-unconfig_remote-explicit             |  4 ++--
 t/t5515/fetch.br-unconfig_remote-glob                 |  4 ++--
 t/t5515/{fetch.master => fetch.main}                  |  6 +++---
 ...aster_--tags_.._.git => fetch.main_--tags_.._.git} |  4 ++--
 t/t5515/{fetch.master_.._.git => fetch.main_.._.git}  |  2 +-
 ...etch.master_.._.git_one => fetch.main_.._.git_one} |  2 +-
 ...h.main_.._.git_one_tag_tag-one_tag_tag-three-file} |  4 ++--
 ...ter_.._.git_one_two => fetch.main_.._.git_one_two} |  2 +-
 ....main_.._.git_tag_tag-one-tree_tag_tag-three-file} |  4 ++--
 ...e => fetch.main_.._.git_tag_tag-one_tag_tag-three} |  4 ++--
 ...r_branches-default => fetch.main_branches-default} |  6 +++---
 ...ch.master_branches-one => fetch.main_branches-one} |  4 ++--
 ...ter_config-explicit => fetch.main_config-explicit} |  6 +++---
 ...etch.master_config-glob => fetch.main_config-glob} |  6 +++---
 ...ter_remote-explicit => fetch.main_remote-explicit} |  6 +++---
 t/t5515/fetch.main_remote-glob                        | 11 +++++++++++
 t/t5515/fetch.master_remote-glob                      | 11 -----------
 62 files changed, 122 insertions(+), 122 deletions(-)
 rename t/t5515/{fetch.master => fetch.main} (78%)
 rename t/t5515/{fetch.master_--tags_.._.git => fetch.main_--tags_.._.git} (81%)
 rename t/t5515/{fetch.master_.._.git => fetch.main_.._.git} (73%)
 rename t/t5515/{fetch.master_.._.git_one => fetch.main_.._.git_one} (74%)
 rename t/t5515/{fetch.master_.._.git_one_tag_tag-one_tag_tag-three-file => fetch.main_.._.git_one_tag_tag-one_tag_tag-three-file} (77%)
 rename t/t5515/{fetch.master_.._.git_one_two => fetch.main_.._.git_one_two} (83%)
 rename t/t5515/{fetch.master_.._.git_tag_tag-one-tree_tag_tag-three-file => fetch.main_.._.git_tag_tag-one-tree_tag_tag-three-file} (74%)
 rename t/t5515/{fetch.master_.._.git_tag_tag-one_tag_tag-three => fetch.main_.._.git_tag_tag-one_tag_tag-three} (75%)
 rename t/t5515/{fetch.master_branches-default => fetch.main_branches-default} (69%)
 rename t/t5515/{fetch.master_branches-one => fetch.main_branches-one} (81%)
 rename t/t5515/{fetch.master_config-explicit => fetch.main_config-explicit} (78%)
 rename t/t5515/{fetch.master_config-glob => fetch.main_config-glob} (77%)
 rename t/t5515/{fetch.master_remote-explicit => fetch.main_remote-explicit} (78%)
 create mode 100644 t/t5515/fetch.main_remote-glob
 delete mode 100644 t/t5515/fetch.master_remote-glob

Message ID	b55eeb80b203b6e44921e6757631653fb02c4f91.1604361307.git.gitgitgadget@gmail.com (mailing list archive)
State	Accepted
Commit	384e08ddf32700060d90a8b720b4a9088d9546de
Headers	show Return-Path: <SRS0=DNVg=EI=vger.kernel.org=git-owner@kernel.org> Message-Id: <b55eeb80b203b6e44921e6757631653fb02c4f91.1604361307.git.gitgitgadget@gmail.com> In-Reply-To: <pull.761.git.1604361307.gitgitgadget@gmail.com> References: <pull.761.git.1604361307.gitgitgadget@gmail.com> Date: Mon, 02 Nov 2020 23:55:05 +0000 Subject: [PATCH 2/4] t5515: use `main` as the name of the main branch for testing (part 2) Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin <johannes.schindelin@gmx.de>, Johannes Schindelin <johannes.schindelin@gmx.de> Precedence: bulk From: Johannes Schindelin <johannes.schindelin@gmx.de>
Series	Adjust t5515 for the upcoming change of the default branch name \| expand [0/4] Adjust t5515 for the upcoming change of the default branch name [1/4] t5515: use `main` as the name of the main branch for testing (part 1) [2/4] t5515: use `main` as the name of the main branch for testing (part 2) [3/4] t5515: use `main` as the name of the main branch for testing (part 3) [4/4] t5515: use `main` as the name of the main branch for testing (conclusion)

[2/4] t5515: use `main` as the name of the main branch for testing (part 2)

Commit Message

Patch