From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CAF79C433E0 for ; Fri, 12 Jun 2020 13:21:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A016B2074B for ; Fri, 12 Jun 2020 13:21:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726323AbgFLNVj (ORCPT ); Fri, 12 Jun 2020 09:21:39 -0400 Received: from smtp.hosts.co.uk ([85.233.160.19]:25643 "EHLO smtp.hosts.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726253AbgFLNVj (ORCPT ); Fri, 12 Jun 2020 09:21:39 -0400 Received: from host-89-243-191-101.as13285.net ([89.243.191.101] helo=[192.168.1.37]) by smtp.hosts.co.uk with esmtpa (Exim) (envelope-from ) id 1jjjcm-00053x-4L; Fri, 12 Jun 2020 14:21:36 +0100 Subject: Re: Rename offensive terminology (master) To: Derrick Stolee , Don Goodman-Wilson , =?UTF-8?Q?Michal_Such=c3=a1nek?= Cc: Johannes Schindelin , "brian m. carlson" , Simon Pieters , git@vger.kernel.org References: <20200505231641.GH6530@camp.crustytoothpaste.net> <20200611115215.GQ21462@kitsune.suse.cz> From: Philip Oakley Message-ID: Date: Fri, 12 Jun 2020 14:21:35 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-Language: en-GB Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On 11/06/2020 13:52, Derrick Stolee wrote: > On 6/11/2020 7:59 AM, Don Goodman-Wilson wrote: >> On Thu, Jun 11, 2020 at 1:52 PM Michal Suchánek wrote: >>> Indeed, the flexibility to choose the name of the default branch can be >>> helpful for projects with specific naming, especially non-english >>> speaking projects. >>> >>> To that end I would suggest adding -b argument to git init to be able to >>> choose the default branch name per project. This should select the >>> initial branch name and also write the it as the default branch name in >>> the repo configuration (if git continues to treat the default branch >>> specially). >>> >>> This can be used in documentation to use the new name immediately >>> without breaking existing workflows that rely on the 'master' branch. >> I _really_ like this idea (and your reasoning). Seconded. > Yes, adding a -b|--branch option would be an excellent addition to > the config option. > > Is their also an option to also add an option to `git clone` to (re)set the default branch name offered by the upstream to that provided? Alternatively provide a `--no-checkout` option for the clone so that either no actual checkout is performed, or maybe that a detached head checkout is performed so that users can name their default branch appropriately. In some cases a true --no-checkout may be the 'best' thing to do to avoid the user mental model confusion about needing to have a local branch matching an upstream branch before they can start their work on top of it (hopefully with a fresh branch name). Philip