Re: Avoiding 'master' nomenclature

From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Jul 29, 2020, 20:51 UTC
Message-ID: <CAHk-=wixwAarobO2CaEBw16+A3ort4Qb7VcDkHT6uaa=07r5Cg@mail.gmail.com>
In-Reply-To: <xmqqa6zi9hrt.fsf@gitster.c.googlers.com>

On Wed, Jul 29, 2020 at 1:40 PM Junio C Hamano <gitster@pobox.com> wrote:

Show 5 quoted lines

>
> The original did two things wrong, i.e. treated one thing specially,
> and designated 'master' which has been declared a dirty word as that
> special thing.  Killing these two wrongs with one stone does not
> feel so stupid.

So here's basically the totality of the patch I just sent out, if you ignore the reverts for all the side effects of the bad fix:

  -       if (!strcmp("master", current_branch))
  +       if (!strcmp(git_default_branch_name(), current_branch))

See? It fixes both issues, _and_ it doesn't break any test-suite or any existing actual users.

So compare that one-liner fix with the commit I'm complaining about:

  git show 489947cee5

which broke actual existing users.

And then tell me which one is the proper fix.

Breaking existing users? Or just fixing the issue with a clean and obvious one-liner?

           Linus