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

Re: Avoiding 'master' nomenclature

From
Linus Torvalds <torvalds@linux-foundation.org>
Date
Jul 29, 2020, 20:23 UTC
Message-ID
<CAHk-=wisOOrfEvab9S417MnPSY8dVkbDOKa6ccdi1Bg3X1PMaw@mail.gmail.com>
In-Reply-To
<xmqqime69jfc.fsf@gitster.c.googlers.com>
On Wed, Jul 29, 2020 at 1:05 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> The intent was to stop treating 'master' as some kind of 'special'
> word, since it is no longer special after init.defaultBranchName was
> invented.
I understand it happened.

I just think it's simplistic and wrong, and outright stupid, exactly because it effectively does the exact opposite of what you should do if you feel that "master" is a bad default.

Yes, the old code hid "master" not because of any language worries, but simply because it was the default branch and thus useless noise.

So the patch does something doubly wrong:
 (a) it doesn't hide the (to some) offensive terminology, quite the reverse
 (b) it now adds back the useless noise

and while I understand why that happened, I can't but feel that it was incredibly pointless and badly done.

What *should* have happened is to hide *both* the new defaultBranchName, _and_ if that wasn't set, "master".

Even if you don't want to treat "master" specially, there's two actual reasons to do so:

 (a) the technical one: it's the old default one in a lot of existing
repositories, so if there is no defaultBranchName, it effectively
_was_ that
 (b) the non-technical one: if the aim is to get rid of "master"
terminology, THAT IS EXACTLY what the code did before it was removed.

So really. Both from a technical _and_ a terminology angle, that commit was just wrong.

             Linus
Previous: Junio C HamanoNext: Jonathan Nieder
Message 3 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.