From: "Theodore Y. Ts'o" <tytso@mit.edu>
To: Lukasz Niemier <Lukasz.Niemier@kobil.com>
Cc: Felipe Contreras <felipe.contreras@gmail.com>,
"brian m. carlson" <sandals@crustytoothpaste.net>,
Git <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Don Goodman-Wilson <don@goodman-wilson.com>
Subject: Re: The master branch rename, and avoiding another v1.6.0 git-foo fiasco
Date: Sat, 14 Nov 2020 22:46:49 -0500 [thread overview]
Message-ID: <20201115034649.GC3985404@mit.edu> (raw)
In-Reply-To: <CBC2DBAA-A409-49CD-B932-AC82D3C20D55@kobil.com>
On Sat, Nov 14, 2020 at 02:19:59PM +0000, Lukasz Niemier wrote:
> > OK, fine. That wasn't clear in your earlier messages. So this is
> > *not* like 2008, where we are breaking workflows or finger macros of
> > *existing* git users.
> >
> > Instead, we might be causing a certain amount of confusion with
> > respect to *new* users, especially if some portion of them are using
> > an older version of git, where the default initial branch name is
> > "master", or a newer version of git, where the default initial branch
> > name is "main".
>
> I am pretty much **existing** Git user where I am maintaining few repos
> yet I am constantly creating new ones for another projects of mine. Such
> abrupt change in the default branch name, without any warning, would be
> very confusing for me. Not every user is working on a single Git repo
> for their whole life.
So we need to make sure existing users know that they can add:
[init]
defaultBranch = master
to their ~/.gitconfig if they want the legacy behavior. This could be
done by, in addition to mentioning it in the release notes, or by
adding a comment printed out when "git init" is run and there is not
init.defaultBranch defined in ~/.gitconfig.
We do something similar if merge.ff is not in ~/.gitconfig, and people
run "git merge" without --no-ff or --ff-only specified on the command
line. So there is precedence for this sort of thing.
This *really* is not hard; which is why I am starting to suspect
people are really kvetching because their objections are really more
about the woke/anti-woke aspect of the "master" -> "main" migration
--- and they are using *think* the children^H^H^H^H^H^H^H users as a
rhetorical device.
- Ted
next prev parent reply other threads:[~2020-11-15 3:47 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-13 0:04 The master branch rename, and avoiding another v1.6.0 git-foo fiasco Felipe Contreras
2020-11-13 1:01 ` brian m. carlson
2020-11-13 4:27 ` Felipe Contreras
2020-11-13 5:14 ` Theodore Y. Ts'o
2020-11-13 6:28 ` Felipe Contreras
2020-11-13 14:58 ` Theodore Y. Ts'o
2020-11-13 15:37 ` Felipe Contreras
2020-11-13 16:08 ` Michal Suchánek
2020-11-14 14:19 ` Lukasz Niemier
2020-11-15 3:46 ` Theodore Y. Ts'o [this message]
2020-11-15 4:27 ` Felipe Contreras
2020-11-19 1:02 ` Brandon Casey
2020-11-19 4:16 ` Peter Hadlaw
2020-11-19 13:37 ` Konstantin Ryabitsev
2020-11-19 21:25 ` Junio C Hamano
2020-11-19 23:29 ` Felipe Contreras
2020-11-20 19:14 ` Konstantin Ryabitsev
2020-11-19 21:29 ` Brandon Casey
2020-11-20 0:34 ` Felipe Contreras
2020-11-13 6:09 ` Don Goodman-Wilson
[not found] ` <nbCkLegnP_kb-16UzAuDChE0p68ZtRD_3ZN3o3BJHYBYpUxTWuKjvhCSKT7zRZl_sckHrkyJl2fwePFUBR-HtDcEV0rHuac6Ygg-FrrYsYI=@goodman-wilson.com>
2020-11-13 6:47 ` Felipe Contreras
2020-11-13 13:53 ` Philippe Blain
2020-11-13 15:49 ` Felipe Contreras
2020-11-23 15:39 ` Whinis
2020-11-20 18:38 ` Ismael Luceno
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=20201115034649.GC3985404@mit.edu \
--to=tytso@mit.edu \
--cc=Johannes.Schindelin@gmx.de \
--cc=Lukasz.Niemier@kobil.com \
--cc=don@goodman-wilson.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sandals@crustytoothpaste.net \
/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).