On Fri, Nov 13, 2020 at 05:13:20PM +0100, Ævar Arnfjörð Bjarmason wrote: > * A lot of tests (but a small minority of the total) have master > "master" hardcoded in some way. We now inventory them in > tests-that-need-master.txt, we can still remove the names from that > file and manually change the code later, but this accomplishes a > clean test run with a relatively easy-to-review diff. > > We ignore GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=<name> when it comes > to these files, unless > GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME_HARDER=true is set. I'm confused how this is better. We could just be setting GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME at the top of those files, couldn't we? (Likewise, I think annotating individual scripts is more decentralized than a magic pattern in test-lib.sh, though it amounts to the same thing). And if I understand the current state of Dscho's patches, we don't _have_ to convert any tests right now. We could just annotate those scripts which are not yet converted to have them use the old name. But I don't think we want to live in that state indefinitely. It's slightly annoying to have inconsistent naming within the tests. I'd be happy to switch individual tests at a leisurely pace over the next couple of months or whatever. But since Dscho has bothered to write all of the patches now, why not use them? I'm much more concerned about the lack of documentation changes associated with the final patch. We don't necessarily need to eradicate every mention of "master" from the documentation, but I think we do need to make sure that examples and instructions are consistent with how Git will actually behave. And that does need to happen at the same time as the user-visible flip of the default. I'm on the fence whether there should be a deprecation period or major version bump for the final patch, but making the tests flexible enough to handle the before and after state seems like it can be done uncoupled from the actual default-flip. -Peff
