From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH 3/5] t3200: avoid variations of the `master` branch name
Date: Wed, 16 Sep 2020 18:39:50 -0400 [thread overview]
Message-ID: <20200916223950.GA1207950@coredump.intra.peff.net> (raw)
In-Reply-To: <xmqqft7huzju.fsf@gitster.c.googlers.com>
On Wed, Sep 16, 2020 at 03:28:21PM -0700, Junio C Hamano wrote:
> Jeff King <peff@peff.net> 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
next prev parent reply other threads:[~2020-09-16 22:40 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-16 18:10 [PATCH 0/5] Inclusive naming, part II Johannes Schindelin via GitGitGadget
2020-09-16 18:10 ` [PATCH 1/5] fast-export: avoid using unnecessary language in a code comment Johannes Schindelin via GitGitGadget
2020-09-16 21:05 ` Junio C Hamano
2020-09-16 18:10 ` [PATCH 2/5] t/test-terminal: avoid non-inclusive language Johannes Schindelin via GitGitGadget
2020-09-16 21:05 ` Junio C Hamano
2020-09-16 21:25 ` Junio C Hamano
2020-09-20 15:34 ` Johannes Schindelin
2020-09-21 21:12 ` Junio C Hamano
2020-09-16 18:10 ` [PATCH 3/5] t3200: avoid variations of the `master` branch name Johannes Schindelin via GitGitGadget
2020-09-16 21:11 ` Jeff King
2020-09-16 22:28 ` Junio C Hamano
2020-09-16 22:39 ` Jeff King [this message]
2020-09-20 15:43 ` Johannes Schindelin
2020-09-21 21:26 ` Junio C Hamano
2020-09-16 18:10 ` [PATCH 4/5] tests: " Johannes Schindelin via GitGitGadget
2020-09-16 18:10 ` [PATCH 5/5] t9902: avoid using the branch name `master` Johannes Schindelin via GitGitGadget
2020-09-21 22:01 ` [PATCH v2 0/5] Inclusive naming, part II Johannes Schindelin via GitGitGadget
2020-09-21 22:01 ` [PATCH v2 1/5] fast-export: avoid using unnecessary language in a code comment Johannes Schindelin via GitGitGadget
2020-09-21 22:01 ` [PATCH v2 2/5] t/test-terminal: avoid non-inclusive language Johannes Schindelin via GitGitGadget
2020-09-21 22:01 ` [PATCH v2 3/5] t3200: avoid variations of the `master` branch name Johannes Schindelin via GitGitGadget
2020-09-21 22:01 ` [PATCH v2 4/5] tests: " Johannes Schindelin via GitGitGadget
2020-09-21 22:31 ` Junio C Hamano
2020-09-26 4:20 ` Johannes Schindelin
2020-09-21 22:01 ` [PATCH v2 5/5] t9902: avoid using the branch name `master` Johannes Schindelin via GitGitGadget
2020-09-21 22:35 ` Junio C Hamano
2020-09-26 4:25 ` Johannes Schindelin
2020-09-21 22:24 ` [PATCH v2 0/5] Inclusive naming, part II Jeff King
2020-09-26 4:29 ` Johannes Schindelin
2020-09-27 8:45 ` Jeff King
2020-09-26 21:04 ` [PATCH v3 " Johannes Schindelin via GitGitGadget
2020-09-26 21:04 ` [PATCH v3 1/5] fast-export: avoid using unnecessary language in a code comment Johannes Schindelin via GitGitGadget
2020-09-26 21:04 ` [PATCH v3 2/5] t/test-terminal: avoid non-inclusive language Johannes Schindelin via GitGitGadget
2020-09-26 21:04 ` [PATCH v3 3/5] t3200: avoid variations of the `master` branch name Johannes Schindelin via GitGitGadget
2020-09-26 21:04 ` [PATCH v3 4/5] tests: " Johannes Schindelin via GitGitGadget
2020-09-26 21:04 ` [PATCH v3 5/5] t9902: avoid using the branch name `master` Johannes Schindelin via GitGitGadget
2020-09-30 22:21 ` [PATCH v3 0/5] Inclusive naming, part II Junio C Hamano
2020-09-30 22:34 ` Jeff King
2020-09-30 22:57 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200916223950.GA1207950@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.