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

Re: [PATCH 3/5] t3200: avoid variations of the `master` branch name

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Sep 20, 2020, 15:43 UTC
Message-ID
<nycvar.QRO.7.76.6.2009201739250.5061@tvgsbejvaqbjf.bet>
In-Reply-To
<20200916223950.GA1207950@coredump.intra.peff.net>
Hi Junio & Peff,
On Wed, 16 Sep 2020, Jeff King wrote:
Show 28 quoted lines
> On Wed, Sep 16, 2020 at 03:28:21PM -0700, Junio C Hamano wrote:
>
> > Jeff King <peff@peff.net> writes:
> >
> > > I'm on the fence on whether this matters. It's a temporary
> > > inconsistency, assuming we eventually move to "main" as the default.
> > > We _could_ push this change off to that patch, too, but it does make
> > > it more noisy.
> >
> > Another way to handle this is perhaps to teach test-lib.sh a way to
> > tell it that we want to live in the world where the initial default
> > branch name is 'main' and use that at the beginning of these select
> > test scripts like t3200.  Then we can do three related things in a
> > single patch to t3200, which are:
> >
> >  - Declare that any "git init" in this test (including the initial
> >    one) uses 'main' as the default branch name;
> >
> >  - rename 'master' used in the test to 'main'
> >
> >  - rename 'master2' used in the test to 'main2'
> >
> > and it would eliminate the awkwardness.
> >
> > The change to test-lib.sh would likely to use init.defaultBranch
> > which also would be a good thing.
>
> Yeah, I'd be perfectly happy with that.

I do want to introduce something like that in the patch series after the next one.

However, in this instance, I think it makes more sense to use a separate name altogether. I settled for using `topic` instead of `main2`, and `new-topic` instead of `main3` locally.

Ciao, Dscho

Previous: Jeff KingNext: Junio C Hamano
Message 6 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.