From: Jeff King <peff@peff.net>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Git List Mailing <git@vger.kernel.org>
Subject: Re: Avoiding 'master' nomenclature
Date: Wed, 29 Jul 2020 16:58:46 -0400 [thread overview]
Message-ID: <20200729205846.GA2992025@coredump.intra.peff.net> (raw)
In-Reply-To: <CAHk-=wi2dsROeg=mij5C8O=UBVZGEpOUp=Bn-arQ7i+Wscynnw@mail.gmail.com>
On Wed, Jul 29, 2020 at 01:40:17PM -0700, Linus Torvalds wrote:
> > So really. Both from a technical _and_ a terminology angle, that
> > commit was just wrong.
>
> So here's the fix.
>
> The fix is effectively a revert of the patch (and a follow-up
> test-case patch), and instead just replaces the "master" nomenclature
> with "git_default_branch_name()".
>
> This patch actually removes more uses of "master" than it adds to git,
> and unlike the patches it replaces, actually removes it from other
> projects commit logs.
>
> Now whatever default branch name you choose really is immaterial.
I don't think that covers all cases.
If I set init.defaultBranch, then that only sets the default branch name
for new repositories I create with "git init". But I may still interact
with many repositories that use a different name (either "master", or
other names chosen by individual projects).
If you suppressed the output for both "master" and
git_default_branch_name(), that would cover more cases, at the expense
of occasionally doing the wrong thing when some project uses "master"
but doesn't mean for it to be a default branch (but that's presumably
rare). It would still do the wrong thing if you prefer "foo" as the
default branch name for your projects, but sometimes work on a project
that prefers "bar".
Users can set init.defaultBranch in individual repository config files
to get the right behavior, though probably it should be a separate
config variable (the reason it is init.defaultBranch and not
core.defaultBranch is that you may want different defaults for different
operations).
So I think a path forward is more like:
1. Add a new config option to shorten fmt-merge-msg's output when the
destination branch matches it (and this should perhaps not even be
a single name, but a set of globs, which supports more workflows).
Call it merge.suppressDest or something.
2. Optionally a repository created with "git init" could copy its
init.defaultBranch into merge.suppressDest. And likewise a clone
might copy the remote HEAD into that variable. I'm not sure if that
is worth doing or not, but it would restore the original behavior
for the most part.
-Peff
next prev parent reply other threads:[~2020-07-29 20:58 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
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 [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200729205846.GA2992025@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=torvalds@linux-foundation.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).