Make t5526 independent of the default branch name #806
Conversation
While at it, use different default branch names for the three different repositories involved in the test script: this makes it easier to debug failures, too (otherwise you have to wonder which `master` branch was meant: the super project's? The submodule's? The nested submodule's?). Note: this touches code that was originally modified to prepare for renaming the default branch name to `main`. This patch side-steps that effort completely by overriding the initial branch name explicitly. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Initially, we started converting this test script in anticipation for renaming the default branch name to `main`. To that end, we partially converted it to accommodate for that default branch name, marking the now-failing test cases with a prereq that was designed to be fulfilled once the rename was complete. However, the effort to move to the branch name `main` needs quite a bit longer, as it was decided that we need a deprecation phase first. To avoid keeping t5526 in limbo for such a long time, we just made it independent of the actual default branch name used by Git. Therefore, that prereq is no longer necessary, and we can drop it. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
|
/submit |
|
Submitted as pull.806.git.1607092462.gitgitgadget@gmail.com To fetch this version into To fetch this version to local tag |
|
On the Git mailing list, Junio C Hamano wrote (reply to this): |
|
This branch is now known as |
|
This patch series was integrated into seen via git@247d873. |
|
This patch series was integrated into seen via git@9ec60c2. |
|
This patch series was integrated into next via git@b16af94. |
|
This patch series was integrated into seen via git@e63ec2b. |
|
This patch series was integrated into seen via git@3fc7fc1. |
|
This patch series was integrated into next via git@3fc7fc1. |
|
This patch series was integrated into master via git@3fc7fc1. |
|
Closed via 3fc7fc1. |
Quite a few test cases in t5526 were marked with the
PREPARE_FOR_MAIN_BRANCHprerequisite, in preparation for changing the fall-back ofinit.defaultBranchtomain. However, in the meantime concerns were raised that I moved too fast on this.As a consequence, t5526 is largely inactive.
This patch series addresses that by overriding the initial branch names explicitly in t5526, and then removing the no-longer-needed prerequisite. With this, we have full test coverage in t5526 again, no matter how long the effort to rename the default branch name will take.