git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 00/11] Drop the PREPARE_FOR_MAIN_BRANCH prereq

From
Junio C Hamano <gitster@pobox.com>
Date
Dec 17, 2020, 01:41 UTC
Message-ID
<xmqqv9d1yzta.fsf@gitster.c.googlers.com>
In-Reply-To
<pull.816.git.1608167230.gitgitgadget@gmail.com>

"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> writes:

Show 8 quoted lines
> To address that, I spent some time to convert just the affected scripts to
> using main, adjusting them in a way where they do not depend on the name git
> init gave the initial branch at all, which allowed me to drop that prereq
> altogether.
>
> None of these changes should be controversial, intentionally so, to allow
> this patch series to go in before v2.30.0 is tagged, so that we can enjoy
> the full coverage of the test suite again.

Thanks for taking care of this one. The titles all imply that we are committed to switch the default to 'main', but I understand that the focus is more about using a hardcoded initial branch in these tests, so that the tests will not be affected when the default changes from 'master' to any other value, even when the ":dirname" and ":random" magic were to be invented and used as the default ;-)

So these may get unwarranted "who says we gained a concensus to change the default in that direction?" complaint, which might want to be reworded, ...

Show 5 quoted lines
>   t3200: finish transitioning to the initial branch name `main`
>   t3201: finalize transitioning to using the branch name `main`
>   t3203: complete the transition to using the branch name `main`
>   t3205: finalize transitioning to using the branch name `main`
>   t5505: finalize transitioning to using the branch name `main`

... but these just make a statement of fact (i.e. these scripts use X as initial branch name), and less likely to confuse the matter.

Show 5 quoted lines
>   t1400: use `main` as initial branch name
>   t5510: use `main` as initial branch name
>   t5703: use `main` as initial branch name
>   t6302: use `main` as initial branch name
>   t9902: use `main` as initial branch name
And of course, this is what we want:
>   tests: drop the `PREPARE_FOR_MAIN_BRANCH` prereq
Thanks.
Previous: Johannes Schindelin via GitGitGadget
Message 13 of 13 in “Drop the PREPARE_FOR_MAIN_BRANCH prereq”
  1. 00/11 Drop the PREPARE_FOR_MAIN_BRANCH prereqJohannes Schindelin via GitGitGadget, Dec 17, 2020
  2. 01/11 t1400: use `main` as initial branch nameJohannes Schindelin via GitGitGadget, Dec 17, 2020
  3. 02/11 t3200: finish transitioning to the initial branch name `main`Johannes Schindelin via GitGitGadget, Dec 17, 2020
  4. 03/11 t3201: finalize transitioning to using the branch name `main`Johannes Schindelin via GitGitGadget, Dec 17, 2020
  5. 06/11 t5505: finalize transitioning to using the branch name `main`Johannes Schindelin via GitGitGadget, Dec 17, 2020
  6. 04/11 t3203: complete the transition to using the branch name `main`Johannes Schindelin via GitGitGadget, Dec 17, 2020
  7. 11/11 tests: drop the `PREPARE_FOR_MAIN_BRANCH` prereqJohannes Schindelin via GitGitGadget, Dec 17, 2020
  8. 09/11 t6302: use `main` as initial branch nameJohannes Schindelin via GitGitGadget, Dec 17, 2020
  9. 05/11 t3205: finalize transitioning to using the branch name `main`Johannes Schindelin via GitGitGadget, Dec 17, 2020
  10. 08/11 t5703: use `main` as initial branch nameJohannes Schindelin via GitGitGadget, Dec 17, 2020
  11. 10/11 t9902: use `main` as initial branch nameJohannes Schindelin via GitGitGadget, Dec 17, 2020
  12. 07/11 t5510: use `main` as initial branch nameJohannes Schindelin via GitGitGadget, Dec 17, 2020
  13. Junio C HamanoDec 17, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.