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

Re: [PATCH v3 0/5] Inclusive naming, part II

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 30, 2020, 22:21 UTC
Message-ID
<xmqqimbugb3l.fsf@gitster.c.googlers.com>
In-Reply-To
<pull.734.v3.git.1601154262.gitgitgadget@gmail.com>

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

Show 30 quoted lines
> This patch series represents the logical next step on the journey begun with
> introducing init.defaultBranch: in these patches, we avoid a couple
> unnecessary mentions of the branch name "master".
>
> This patch series does not try to change the default branch name, although I
> have that patch series ready to go. You can see the overall idea here: 
> https://github.com/gitgitgadget/git/pull/655. Concretely, I plan on
> submitting three more patch series after this one:
>
>  1. a relatively small patch series to avoid using the branch name main in
>     the test suite. This is necessary because my plan is to change the
>     default branch name to that name, therefore it cannot be used as the
>     name of a topic branch any longer.
>  2. a relatively large patch series (currently consisting of 18 patches) to
>     change the default branch name to main. Most of the patches provide
>     non-trivial (read: non-scriptable) adjustments to the test suite in an
>     incremental fashion, with a big patch toward the end that reflects a
>     fully-automated search-and-replace of all the trivial cases.
>  3. a very small patch series with fall-out patches that are not necessary
>     to pass the test suite, but are still required to complete the rename
>     (adjusted code comment, file rename).
>
> (Note: I am still debating whether I should move one or two patches from the
> second to the third patch series)
>
> Changes since v2:
>
>  * Extended the idea of using topic instead of main to patch 4/5.
>  * Explained in the commit message of patch 5/5 why we cannot use topic 
>    instead of main here.

This round hasn't seen any new comments. I quickly scanned them one more time, and it seems to be in good shape.

Shall we merge it down to 'next'?
Thanks.
Previous: Johannes Schindelin via GitGitGadgetNext: Jeff King
Message 36 of 38 in “Inclusive naming, part II”
  1. 0/5 Inclusive naming, part IIJohannes Schindelin via GitGitGadget, Sep 16, 2020
  2. 3/5 t3200: avoid variations of the `master` branch nameJohannes Schindelin via GitGitGadget, Sep 16, 2020
  3. Jeff KingSep 16, 2020
  4. Junio C HamanoSep 16, 2020
  5. Jeff KingSep 16, 2020
  6. Johannes SchindelinSep 20, 2020
  7. Junio C HamanoSep 21, 2020
  8. 4/5 tests: avoid variations of the `master` branch nameJohannes Schindelin via GitGitGadget, Sep 16, 2020
  9. 5/5 t9902: avoid using the branch name `master`Johannes Schindelin via GitGitGadget, Sep 16, 2020
  10. 2/5 t/test-terminal: avoid non-inclusive languageJohannes Schindelin via GitGitGadget, Sep 16, 2020
  11. Junio C HamanoSep 16, 2020
  12. Junio C HamanoSep 16, 2020
  13. Johannes SchindelinSep 20, 2020
  14. Junio C HamanoSep 21, 2020
  15. 1/5 fast-export: avoid using unnecessary language in a code commentJohannes Schindelin via GitGitGadget, Sep 16, 2020
  16. Junio C HamanoSep 16, 2020
  17. 0/5 Inclusive naming, part IIJohannes Schindelin via GitGitGadget, Sep 21, 2020
  18. 1/5 fast-export: avoid using unnecessary language in a code commentJohannes Schindelin via GitGitGadget, Sep 21, 2020
  19. 3/5 t3200: avoid variations of the `master` branch nameJohannes Schindelin via GitGitGadget, Sep 21, 2020
  20. 4/5 tests: avoid variations of the `master` branch nameJohannes Schindelin via GitGitGadget, Sep 21, 2020
  21. Junio C HamanoSep 21, 2020
  22. Johannes SchindelinSep 26, 2020
  23. 5/5 t9902: avoid using the branch name `master`Johannes Schindelin via GitGitGadget, Sep 21, 2020
  24. Junio C HamanoSep 21, 2020
  25. Johannes SchindelinSep 26, 2020
  26. 2/5 t/test-terminal: avoid non-inclusive languageJohannes Schindelin via GitGitGadget, Sep 21, 2020
  27. Jeff KingSep 21, 2020
  28. Johannes SchindelinSep 26, 2020
  29. Jeff KingSep 27, 2020
  30. 0/5 Inclusive naming, part IIJohannes Schindelin via GitGitGadget, Sep 26, 2020
  31. 1/5 fast-export: avoid using unnecessary language in a code commentJohannes Schindelin via GitGitGadget, Sep 26, 2020
  32. 2/5 t/test-terminal: avoid non-inclusive languageJohannes Schindelin via GitGitGadget, Sep 26, 2020
  33. 4/5 tests: avoid variations of the `master` branch nameJohannes Schindelin via GitGitGadget, Sep 26, 2020
  34. 3/5 t3200: avoid variations of the `master` branch nameJohannes Schindelin via GitGitGadget, Sep 26, 2020
  35. 5/5 t9902: avoid using the branch name `master`Johannes Schindelin via GitGitGadget, Sep 26, 2020
  36. Junio C HamanoSep 30, 2020
  37. Jeff KingSep 30, 2020
  38. Junio C HamanoSep 30, 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.