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

Re: [PATCH 00/10] Prepare for changing the default branch name main (last manual part)

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Oct 22, 2020, 13:11 UTC
Message-ID
<nycvar.QRO.7.76.6.2010221509430.56@tvgsbejvaqbjf.bet>
In-Reply-To
<xmqqblgv5jfk.fsf@gitster.c.googlers.com>
Hi Junio,
On Wed, 21 Oct 2020, Junio C Hamano wrote:
Show 15 quoted lines
> "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
> writes:
>
> > In preparation for changing the default of init.defaultBranch to main, here
> > are a couple of manual adjustments that cannot be automated (i.e., these
> > adjustments are not mere search-and-replaces).
> >
> > This patch series is based on js/default-branch-name-part-3, and is part of
> > the larger effort tracked at https://github.com/gitgitgadget/git/pull/655.
> >
> > The next patch series will be largely automated search-and-replaces;
> > Obviously, the search-and-replace was the easy part, the manual inspection
> > whether the changes are actually correct was much more involved.
>
> Yes.  That's always the pain-point of a tree-wide change like this.

To help with such a huge change, I tried to minimize the manual patches, and wrote the exact shell commands into the non-manual patches. Hopefully this will help us with the transition.

Show 8 quoted lines
> > What to expect next, after this patch series? Essentially, there is the
> > large patch series that adjusts the entire test suite, with two patch series
> > extracted from that effort: t5411 and t5515 simply require too large
> > patches, and will therefore be presented as the next patch series after this
> > one.
>
> This one is already a bit too ambitious in that it collides with
> stuff in flight, by the way.

Okay, I will leave out the t4013 changes from this patch series, and re-submit once `mk/diff-ignore-regex` advances to `next`.

Thank you for reviewing this patch series, Dscho

Previous: Junio C HamanoNext: Johannes Schindelin via GitGitGadget
Message 24 of 35 in “Prepare for changing the default branch name main (last manual part)”
  1. 00/10 Prepare for changing the default branch name main (last manual part)Johannes Schindelin via GitGitGadget, Oct 19, 2020
  2. 01/10 fmt-merge-msg: also suppress "into main" by defaultJohannes Schindelin via GitGitGadget, Oct 19, 2020
  3. Junio C HamanoOct 21, 2020
  4. Johannes SchindelinOct 22, 2020
  5. 02/10 t9801: use `--` in preparation for default branch renameJohannes Schindelin via GitGitGadget, Oct 19, 2020
  6. Junio C HamanoOct 21, 2020
  7. 03/10 tests: start moving to a different default main branch nameJohannes Schindelin via GitGitGadget, Oct 19, 2020
  8. Junio C HamanoOct 21, 2020
  9. 05/10 t6200: adjust suppression pattern to also match "main"Johannes Schindelin via GitGitGadget, Oct 19, 2020
  10. Junio C HamanoOct 21, 2020
  11. Johannes SchindelinOct 22, 2020
  12. 06/10 t5703: adjust a test case for the upcoming default branch nameJohannes Schindelin via GitGitGadget, Oct 19, 2020
  13. Junio C HamanoOct 21, 2020
  14. 07/10 t3200: prepare for `main` being shorter than `master`Johannes Schindelin via GitGitGadget, Oct 19, 2020
  15. Junio C HamanoOct 21, 2020
  16. Johannes SchindelinOct 22, 2020
  17. 04/10 t4013: prepare for the new default branch name "main"Johannes Schindelin via GitGitGadget, Oct 19, 2020
  18. Junio C HamanoOct 21, 2020
  19. Johannes SchindelinOct 22, 2020
  20. 09/10 tests: prepare aligned mentions of the default branch nameJohannes Schindelin via GitGitGadget, Oct 19, 2020
  21. 08/10 t9902: prepare a test for the upcoming default branch nameJohannes Schindelin via GitGitGadget, Oct 19, 2020
  22. 10/10 t1400: prepare for `main` being default branch nameJohannes Schindelin via GitGitGadget, Oct 19, 2020
  23. Junio C HamanoOct 21, 2020
  24. Johannes SchindelinOct 22, 2020
  25. 0/9 Prepare for changing the default branch name main (last manual part)Johannes Schindelin via GitGitGadget, Oct 23, 2020
  26. 1/9 fmt-merge-msg: also suppress "into main" by defaultJohannes Schindelin via GitGitGadget, Oct 23, 2020
  27. 2/9 t9801: use `--` in preparation for default branch renameJohannes Schindelin via GitGitGadget, Oct 23, 2020
  28. 3/9 tests: start moving to a different default main branch nameJohannes Schindelin via GitGitGadget, Oct 23, 2020
  29. 4/9 t6200: adjust suppression pattern to also match "main"Johannes Schindelin via GitGitGadget, Oct 23, 2020
  30. 7/9 t9902: prepare a test for the upcoming default branch nameJohannes Schindelin via GitGitGadget, Oct 23, 2020
  31. 6/9 t3200: prepare for `main` being shorter than `master`Johannes Schindelin via GitGitGadget, Oct 23, 2020
  32. 5/9 t5703: adjust a test case for the upcoming default branch nameJohannes Schindelin via GitGitGadget, Oct 23, 2020
  33. 9/9 t1400: prepare for `main` being default branch nameJohannes Schindelin via GitGitGadget, Oct 23, 2020
  34. 8/9 tests: prepare aligned mentions of the default branch nameJohannes Schindelin via GitGitGadget, Oct 23, 2020
  35. Junio C HamanoOct 23, 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.