git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
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 1/4] t5411: start using the default branch name "main"
Date: Wed, 28 Oct 2020 13:12:00 -0700	[thread overview]
Message-ID: <xmqq5z6u9kkv.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <xmqqa6w69l3j.fsf@gitster.c.googlers.com> (Junio C. Hamano's message of "Wed, 28 Oct 2020 13:00:48 -0700")

Junio C Hamano <gitster@pobox.com> writes:

>> +test_have_prereq PREPARE_FOR_MAIN_BRANCH || {
>> +	test_skip="In transit for the default branch name 'main'"
>> +	test_done
>> +}
>> +
>
> IOW, I do not see the point in _conditionally_ skipping the rest of
> the test in this step.  I'd however understand it if we always skip
> the rest in 1/4 and then enable the rest only when testing with
> 'main' as the default in 4/4, when all the necessary pieces in
> t/t5411 have been converted.

Another way to protect the test well would be to keep the "unless
testing with master, skip all" prerequisite check you wrote above,
but add

    GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master

immediately before that.  We can flip it to use 'master' at the
final step in the series.

That way, we will not be affected by the GIT_TEST_* environment
variable that is passed to these scripts by the tester.  I think
I'd prefer to do it that way, instead of unconditionally skipping,
as the result would be more self explanatory.

Thanks.

  reply	other threads:[~2020-10-28 21:48 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-27 22:58 [PATCH 0/4] Adjust t5411 for the upcoming change of the default branch name Johannes Schindelin via GitGitGadget
2020-10-27 22:58 ` [PATCH 1/4] t5411: start using the default branch name "main" Johannes Schindelin via GitGitGadget
2020-10-28 20:00   ` Junio C Hamano
2020-10-28 20:12     ` Junio C Hamano [this message]
2020-10-30 15:04       ` Johannes Schindelin
2020-10-30 17:06         ` Junio C Hamano
2020-10-27 22:58 ` [PATCH 2/4] t5411: start adjusting the support files for init.defaultBranch=main Johannes Schindelin via GitGitGadget
2020-10-27 22:58 ` [PATCH 3/4] t5411: adjust the remaining " Johannes Schindelin via GitGitGadget
2020-10-27 22:58 ` [PATCH 4/4] t5411: finish preparing for `main` being the default branch name Johannes Schindelin via GitGitGadget
2020-10-31 19:45 ` [PATCH v2 0/4] Adjust t5411 for the upcoming change of " Johannes Schindelin via GitGitGadget
2020-10-31 19:46   ` [PATCH v2 1/4] t5411: start using the default branch name "main" Johannes Schindelin via GitGitGadget
2020-10-31 19:46   ` [PATCH v2 2/4] t5411: start adjusting the support files for init.defaultBranch=main Johannes Schindelin via GitGitGadget
2020-10-31 19:46   ` [PATCH v2 3/4] t5411: adjust the remaining " Johannes Schindelin via GitGitGadget
2020-10-31 19:46   ` [PATCH v2 4/4] t5411: finish preparing for `main` being the default branch name Johannes Schindelin via GitGitGadget

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqq5z6u9kkv.fsf@gitster.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=johannes.schindelin@gmx.de \
    --subject='Re: [PATCH 1/4] t5411: start using the default branch name "main"' \
    /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

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).