From: Junio C Hamano <gitster@pobox.com>
To: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH 00/11] Drop the PREPARE_FOR_MAIN_BRANCH prereq
Date: Wed, 16 Dec 2020 17:41:05 -0800 [thread overview]
Message-ID: <xmqqv9d1yzta.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <pull.816.git.1608167230.gitgitgadget@gmail.com> (Johannes Schindelin via GitGitGadget's message of "Thu, 17 Dec 2020 01:06:59 +0000")
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:
> To address that, I spent some time to convert just the affected scripts to
> using main, adjusting them in a way where they do not depend on the name git
> init gave the initial branch at all, which allowed me to drop that prereq
> altogether.
>
> None of these changes should be controversial, intentionally so, to allow
> this patch series to go in before v2.30.0 is tagged, so that we can enjoy
> the full coverage of the test suite again.
Thanks for taking care of this one. The titles all imply that we
are committed to switch the default to 'main', but I understand that
the focus is more about using a hardcoded initial branch in these
tests, so that the tests will not be affected when the default
changes from 'master' to any other value, even when the ":dirname"
and ":random" magic were to be invented and used as the default ;-)
So these may get unwarranted "who says we gained a concensus to
change the default in that direction?" complaint, which might want
to be reworded, ...
> t3200: finish transitioning to the initial branch name `main`
> t3201: finalize transitioning to using the branch name `main`
> t3203: complete the transition to using the branch name `main`
> t3205: finalize transitioning to using the branch name `main`
> t5505: finalize transitioning to using the branch name `main`
... but these just make a statement of fact (i.e. these scripts use
X as initial branch name), and less likely to confuse the matter.
> t1400: use `main` as initial branch name
> t5510: use `main` as initial branch name
> t5703: use `main` as initial branch name
> t6302: use `main` as initial branch name
> t9902: use `main` as initial branch name
And of course, this is what we want:
> tests: drop the `PREPARE_FOR_MAIN_BRANCH` prereq
Thanks.
prev parent reply other threads:[~2020-12-17 1:42 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-17 1:06 [PATCH 00/11] Drop the PREPARE_FOR_MAIN_BRANCH prereq Johannes Schindelin via GitGitGadget
2020-12-17 1:07 ` [PATCH 01/11] t1400: use `main` as initial branch name Johannes Schindelin via GitGitGadget
2020-12-17 1:07 ` [PATCH 02/11] t3200: finish transitioning to the initial branch name `main` Johannes Schindelin via GitGitGadget
2020-12-17 1:07 ` [PATCH 03/11] t3201: finalize transitioning to using the " Johannes Schindelin via GitGitGadget
2020-12-17 1:07 ` [PATCH 04/11] t3203: complete the transition " Johannes Schindelin via GitGitGadget
2020-12-17 1:07 ` [PATCH 05/11] t3205: finalize transitioning " Johannes Schindelin via GitGitGadget
2020-12-17 1:07 ` [PATCH 06/11] t5505: " Johannes Schindelin via GitGitGadget
2020-12-17 1:07 ` [PATCH 07/11] t5510: use `main` as initial branch name Johannes Schindelin via GitGitGadget
2020-12-17 1:07 ` [PATCH 08/11] t5703: " Johannes Schindelin via GitGitGadget
2020-12-17 1:07 ` [PATCH 09/11] t6302: " Johannes Schindelin via GitGitGadget
2020-12-17 1:07 ` [PATCH 10/11] t9902: " Johannes Schindelin via GitGitGadget
2020-12-17 1:07 ` [PATCH 11/11] tests: drop the `PREPARE_FOR_MAIN_BRANCH` prereq Johannes Schindelin via GitGitGadget
2020-12-17 1:41 ` Junio C Hamano [this message]
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=xmqqv9d1yzta.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).