From: Linus Torvalds <torvalds@linux-foundation.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Git List Mailing <git@vger.kernel.org>
Subject: Re: Avoiding 'master' nomenclature
Date: Wed, 29 Jul 2020 13:23:33 -0700 [thread overview]
Message-ID: <CAHk-=wisOOrfEvab9S417MnPSY8dVkbDOKa6ccdi1Bg3X1PMaw@mail.gmail.com> (raw)
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
next prev parent reply other threads:[~2020-07-29 20:23 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-29 19:44 Avoiding 'master' nomenclature Linus Torvalds
2020-07-29 20:04 ` Junio C Hamano
2020-07-29 20:23 ` Linus Torvalds [this message]
2020-07-29 20:38 ` Jonathan Nieder
2020-07-29 20:46 ` Linus Torvalds
2020-07-29 20:56 ` Linus Torvalds
2020-07-30 8:17 ` lego_12239
2020-07-31 0:57 ` Jeff King
2020-07-31 8:19 ` Oleg
2020-07-29 20:40 ` Linus Torvalds
2020-07-29 20:58 ` Jeff King
2020-07-29 21:20 ` Linus Torvalds
2020-07-30 0:29 ` Jeff King
2020-07-30 0:44 ` Linus Torvalds
2020-07-30 0:52 ` Jeff King
2020-07-30 0:57 ` Linus Torvalds
2020-07-31 0:44 ` Jeff King
2020-07-29 21:25 ` Junio C Hamano
2020-07-29 22:50 ` Junio C Hamano
2020-07-30 0:14 ` Jeff King
2020-07-30 0:23 ` Linus Torvalds
2020-07-30 10:11 ` Michal Suchánek
2020-07-30 0:31 ` Jeff King
2020-07-30 0:36 ` Junio C Hamano
2020-07-30 18:02 ` [PATCH v3 0/2] fmt-merge-msg: selectively suppress "into <branch>" Junio C Hamano
2020-07-30 18:02 ` [PATCH v3 1/2] Revert "fmt-merge-msg: stop treating `master` specially" Junio C Hamano
2020-07-30 19:10 ` Eric Sunshine
2020-07-30 19:40 ` Junio C Hamano
2020-07-30 18:02 ` [PATCH v3 2/2] fmt-merge-msg: allow merge destination to be omitted again Junio C Hamano
2020-07-31 0:42 ` [PATCH v3 0/2] fmt-merge-msg: selectively suppress "into <branch>" Jeff King
2020-07-31 2:04 ` Junio C Hamano
2020-07-31 2:22 ` Jeff King
2020-07-31 20:03 ` Taylor Blau
2020-07-31 20:12 ` Junio C Hamano
2020-07-31 20:17 ` Taylor Blau
2020-08-01 7:15 ` Michal Suchánek
2020-08-10 11:53 ` Avoiding 'master' nomenclature Johannes Schindelin
2020-08-10 15:45 ` Junio C Hamano
2020-08-11 2:39 ` Johannes Schindelin
2020-08-12 0:30 ` Junio C Hamano
2020-07-29 20:40 ` Junio C Hamano
2020-07-29 20:51 ` Linus Torvalds
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAHk-=wisOOrfEvab9S417MnPSY8dVkbDOKa6ccdi1Bg3X1PMaw@mail.gmail.com' \
--to=torvalds@linux-foundation.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).