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

Re: Avoiding 'master' nomenclature

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 10, 2020, 15:45 UTC
Message-ID
<xmqqo8nicxn2.fsf@gitster.c.googlers.com>
In-Reply-To
<nycvar.QRO.7.76.6.2008101349570.50@tvgsbejvaqbjf.bet>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> Looks good to me, and apart from the config key (for which I also don't
> have a better suggestion), this looks pretty much how I would have done it
> (but refrained from doing because I really wanted the patch series to be
> part of v2.28.0).

Yes, my fault. What you originally had was "we no longer special case 'master', we special case init.default instead", and after I responded with "why special case anything? everybody is equal ;-)" we ended up marking merges to 'master' as such in the latest release.

The patch you are responding to is much more in line with the way in which we dealt with the special casing of 'master' in the fast-export anonymization in the latest release, and I am reasonably happy with it. Until we need to worry about the "do we need to keep track of which branch is the 'primary' one in this repository automatically?" issue sometime later, that is.

> TBH I expected some discussion along the line "Shouldn't this be an
> opt-in, with the initial default saying 'every branch except `master`'?",
> but that seems not to have taken place.

I do not quite get it. Without any explicit configuration, every branch except 'master' is shown, just like we've done for the past 15 years. You can opt into hiding other names instead of 'master', hiding nothing, or hiding everything.

Thanks.
Previous: Johannes SchindelinNext: Johannes Schindelin
Message 38 of 42 in “Avoiding 'master' nomenclature”
  1. Linus TorvaldsJul 29, 2020
  2. Junio C HamanoJul 29, 2020
  3. Linus TorvaldsJul 29, 2020
  4. Jonathan NiederJul 29, 2020
  5. Linus TorvaldsJul 29, 2020
  6. Linus TorvaldsJul 29, 2020
  7. lego_12239@rambler.ruJul 30, 2020
  8. Jeff KingJul 31, 2020
  9. OlegJul 31, 2020
  10. Linus TorvaldsJul 29, 2020
  11. Jeff KingJul 29, 2020
  12. Linus TorvaldsJul 29, 2020
  13. Jeff KingJul 30, 2020
  14. Linus TorvaldsJul 30, 2020
  15. Jeff KingJul 30, 2020
  16. Linus TorvaldsJul 30, 2020
  17. Jeff KingJul 31, 2020
  18. Junio C HamanoJul 29, 2020
  19. Junio C HamanoJul 29, 2020
  20. Jeff KingJul 30, 2020
  21. Linus TorvaldsJul 30, 2020
  22. Michal SuchánekJul 30, 2020
  23. Jeff KingJul 30, 2020
  24. Junio C HamanoJul 30, 2020
  25. 0/2 fmt-merge-msg: selectively suppress "into <branch>"Junio C Hamano, Jul 30, 2020
  26. 2/2 fmt-merge-msg: allow merge destination to be omitted againJunio C Hamano, Jul 30, 2020
  27. 1/2 Revert "fmt-merge-msg: stop treating `master` specially"Junio C Hamano, Jul 30, 2020
  28. Eric SunshineJul 30, 2020
  29. Junio C HamanoJul 30, 2020
  30. Jeff KingJul 31, 2020
  31. Junio C HamanoJul 31, 2020
  32. Jeff KingJul 31, 2020
  33. Taylor BlauJul 31, 2020
  34. Junio C HamanoJul 31, 2020
  35. Taylor BlauJul 31, 2020
  36. Michal SuchánekAug 1, 2020
  37. Johannes SchindelinAug 10, 2020
  38. Junio C HamanoAug 10, 2020
  39. Johannes SchindelinAug 11, 2020
  40. Junio C HamanoAug 12, 2020
  41. Junio C HamanoJul 29, 2020
  42. Linus TorvaldsJul 29, 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.