From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from bat.birch.relay.mailchannels.net (bat.birch.relay.mailchannels.net [23.83.209.13]) by sourceware.org (Postfix) with ESMTPS id 262E43857C5E for ; Thu, 14 Jan 2021 11:18:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 262E43857C5E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gotplt.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=siddhesh@gotplt.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id B7801482D22; Thu, 14 Jan 2021 11:18:07 +0000 (UTC) Received: from pdx1-sub0-mail-a11.g.dreamhost.com (100-105-161-30.trex.outbound.svc.cluster.local [100.105.161.30]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 5B482482C85; Thu, 14 Jan 2021 11:18:07 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from pdx1-sub0-mail-a11.g.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384) by 0.0.0.0:2500 (trex/6.0.1); Thu, 14 Jan 2021 11:18:07 +0000 X-MC-Relay: Junk X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Spicy-Decisive: 47c293df7ba16e83_1610623087584_666188216 X-MC-Loop-Signature: 1610623087584:3731031357 X-MC-Ingress-Time: 1610623087584 Received: from pdx1-sub0-mail-a11.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a11.g.dreamhost.com (Postfix) with ESMTP id 23EDC8001D; Thu, 14 Jan 2021 03:18:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gotplt.org; h=subject:to :references:from:message-id:date:mime-version:in-reply-to :content-type:content-transfer-encoding; s=gotplt.org; bh=KoQqPS noTtdX1093HCs3OvDEU9Q=; b=ZRku9wHla/lzmUCFiTTFifZStDW7C/6K958tN7 hwsHkXHjdxUQ1kX+lQJ4iLj/OYKOcdjnTH+LaL6R+FJGkAvOQlgyX0CHPfCn8GEl TnTUJhx5rKWCrD/dqUITONYf+Ht6RP23xT0FjoV8Lq5zNI1qnUv22r+JMTQcIB5N 3KnJg= Received: from [192.168.86.152] (unknown [103.199.172.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a11.g.dreamhost.com (Postfix) with ESMTPSA id 539A980014; Thu, 14 Jan 2021 03:18:04 -0800 (PST) Subject: Re: Rename "master" branch to "main"? To: Carlos O'Donell , libc-alpha References: <20210114092156.GK6938@vapier> X-DH-BACKEND: pdx1-sub0-mail-a11 From: Siddhesh Poyarekar Message-ID: <31b2b13b-0ef9-8c84-b280-a43466a3e13c@gotplt.org> Date: Thu, 14 Jan 2021 16:47:38 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <20210114092156.GK6938@vapier> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-3026.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, NICE_REPLY_A, RCVD_IN_ABUSEAT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, RCVD_IN_SBL_CSS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=no 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 11:18:10 -0000 On 1/14/21 2:51 PM, Mike Frysinger via Libc-alpha wrote: > 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. +1, this seems like a reasonable approach. > bonus points: "main" is shorter to type than "master", and it's > mostly the same amount of tab completion. I like 'trunk' too as a hat tip to the old days (and it works well with 'branches') but I'm staying away from the bike shed :) Siddhesh