From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 1D5CD385802E for ; Thu, 14 Jan 2021 09:21:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 1D5CD385802E Received: from vapier (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with SMTP id 2699234085A; Thu, 14 Jan 2021 09:21:56 +0000 (UTC) Date: Thu, 14 Jan 2021 04:21:56 -0500 From: Mike Frysinger To: Carlos O'Donell Cc: libc-alpha Subject: Re: Rename "master" branch to "main"? Message-ID: <20210114092156.GK6938@vapier> Mail-Followup-To: Carlos O'Donell , libc-alpha References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="C7Ke/meiCZutM6I/" Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-5.6 required=5.0 tests=BAYES_00, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jan 2021 09:21:58 -0000 --C7Ke/meiCZutM6I/ Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 30 Jun 2020 14:10, Carlos O'Donell via Libc-alpha wrote: > As we approach the release boundary for 2.32 we come to a natural point > where we can rename our development and release branch. >=20 > My proposal would be to rename the development and current release branch: >=20 > * master -> main this seems to have stalled. we should do this! i don't think we need to wait on git itself. even before 2020, many projects used names other than "master" for branches as their default. but now as we start 2021, the number of projects that have migrated has gone up quite a lot, and with GH making it well known to many people, i think that addresses the "it's confusing" angle. wrt compatibility, i played around with things a little on my own server, and it seems that someone with shell access could set up a redirect: $ cat refs/heads/master ref: refs/heads/main pushing to master in this situation will update main. that should be a fairly easy way to not break existing checkouts but allowing the default to switch to "main". if we consider the number of devs with write access is low, we can block pushes to "master" and they would be forced to migrate. then once people are eased in to the new state, we can either delete master or freeze it. either way, anyone actively pulling from the repo should notice quickly. bonus points: "main" is shorter to type than "master", and it's mostly the same amount of tab completion. -mike --C7Ke/meiCZutM6I/ Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEuQK1JxMl+JKsJRrUQWM7n+g39YEFAmAADTQACgkQQWM7n+g3 9YHJshAA1tjFtWH/76Wh1A6VejWWkhonCcrj+/7TVSS9VftwABIUxRgWlda6ypBn bGN7Xk5mJC5vt0ECxpDMl8IrOFHUECZtVdJtgnzZaj1xe70hR5GzHk4dyyLLMgjK /rDp7VkuKGn4sW0L3s0AqWXs5Vxjvt0JGCQXBLo93G7brOrJtGeAlmY3fmiGyq6F 5IYypC0d8C8eZpzQZxSeOUT4se9v+PFW9TTc27ifp95FU53Sp+GOo2oRtNRrJLyR 8mvyPLlcWHEChLx8yMZijG0bFxFrtmCS6qScoQcQ6dkN2o/Qb2HQx8uPRKUcqu9+ P99yGUbMBWsaA5skfcc24Q4a+mqUyME4dZ1+ZfwczESElQSKQ2eCZOY6rWoqvA++ fWU6+DvCoPSpcgV+Mro1F8xtksRuevtVevA4gw7D6Mp/lNPjYtj3bQrws82LcEDc cQPKWkRflQ4V65CZe4BCoGspPnU/aY6YCVzHezFUUOVcwwru6vt1j3jEb9IXHun3 ru0fSnIv4zvmFUISuu2TTpLOpQ7IlR6c0f7BFd6dXHHKvxTB3agj/VR5Vp8Iq4nA SbfC1WoQz5XaskwGVE4rEwqkK/xjpmEV7PRD5zbsexmQUUuDAtUtftAb+3VyLlPP wAKpHJDN11rLkg/cLSQNy0AeQFo+q4nA3Npm5qOkao1lQbY9+wU= =BaAQ -----END PGP SIGNATURE----- --C7Ke/meiCZutM6I/--