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.8 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 901BD1F4B4 for ; Wed, 16 Sep 2020 22:40:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726982AbgIPWjz (ORCPT ); Wed, 16 Sep 2020 18:39:55 -0400 Received: from cloud.peff.net ([104.130.231.41]:59268 "EHLO cloud.peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726382AbgIPWjv (ORCPT ); Wed, 16 Sep 2020 18:39:51 -0400 Received: (qmail 27481 invoked by uid 109); 16 Sep 2020 22:39:51 -0000 Received: from Unknown (HELO peff.net) (10.0.1.2) by cloud.peff.net (qpsmtpd/0.94) with ESMTP; Wed, 16 Sep 2020 22:39:51 +0000 Authentication-Results: cloud.peff.net; auth=none Received: (qmail 2503 invoked by uid 111); 16 Sep 2020 22:39:51 -0000 Received: from coredump.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.2) by peff.net (qpsmtpd/0.94) with (TLS_AES_256_GCM_SHA384 encrypted) ESMTPS; Wed, 16 Sep 2020 18:39:51 -0400 Authentication-Results: peff.net; auth=none Date: Wed, 16 Sep 2020 18:39:50 -0400 From: Jeff King To: Junio C Hamano Cc: Johannes Schindelin via GitGitGadget , git@vger.kernel.org, Johannes Schindelin Subject: Re: [PATCH 3/5] t3200: avoid variations of the `master` branch name Message-ID: <20200916223950.GA1207950@coredump.intra.peff.net> References: <2f1d0a2df41f567bc1a8bc446c26e1cb8b6dc36c.1600279853.git.gitgitgadget@gmail.com> <20200916211150.GA617237@coredump.intra.peff.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Wed, Sep 16, 2020 at 03:28:21PM -0700, Junio C Hamano wrote: > Jeff King writes: > > > I'm on the fence on whether this matters. It's a temporary > > inconsistency, assuming we eventually move to "main" as the default. We > > _could_ push this change off to that patch, too, but it does make it > > more noisy. > > Another way to handle this is perhaps to teach test-lib.sh a way to > tell it that we want to live in the world where the initial default > branch name is 'main' and use that at the beginning of these select > test scripts like t3200. Then we can do three related things in a > single patch to t3200, which are: > > - Declare that any "git init" in this test (including the initial > one) uses 'main' as the default branch name; > > - rename 'master' used in the test to 'main' > > - rename 'master2' used in the test to 'main2' > > and it would eliminate the awkwardness. > > The change to test-lib.sh would likely to use init.defaultBranch > which also would be a good thing. Yeah, I'd be perfectly happy with that. -Peff