From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.5 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id E90491F5AE for ; Mon, 15 Jun 2020 10:07:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728899AbgFOKHj (ORCPT ); Mon, 15 Jun 2020 06:07:39 -0400 Received: from mx2.suse.de ([195.135.220.15]:50390 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726111AbgFOKHj (ORCPT ); Mon, 15 Jun 2020 06:07:39 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id F4154ACBD; Mon, 15 Jun 2020 10:07:40 +0000 (UTC) Date: Mon, 15 Jun 2020 12:07:35 +0200 From: Michal =?iso-8859-1?Q?Such=E1nek?= To: Johannes Schindelin Cc: Junio C Hamano , Derrick Stolee , Don Goodman-Wilson , "brian m. carlson" , Simon Pieters , git@vger.kernel.org Subject: Re: Rename offensive terminology (master) Message-ID: <20200615100735.GV21462@kitsune.suse.cz> References: <20200505231641.GH6530@camp.crustytoothpaste.net> <20200611115215.GQ21462@kitsune.suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Sun, Jun 14, 2020 at 04:59:32AM +0200, Johannes Schindelin wrote: > Hi, > > On Thu, 11 Jun 2020, Junio C Hamano wrote: > > > Derrick Stolee writes: > > > > > 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. > > > > In the ideal world, users should be able to just set > > init.defaultBranchName in ~/.gitconfig once and forget about it. > > But it is expected that some projects and their tools may heavily > > depend on the assumption that the primary branch is called 'master'. > > Giving a command line override like "init -b" (and do not forget to > > do the same for "clone" as necessary) is a good escape hatch for > > members of such projects. > > I agree, and I incorporated this already in the latest version I pushed to > https://github.com/gitgitgadget/git/pull/656. Why should everyone use the same branch names? It makes more sense for people to name their branches in a way that makes sense in the context of their project/workflow/language. Showing the use of -b with init in tutorials and examples would facilitate that. Thanks Michal