Re: [PATCH 1/4] t5411: start using the default branch name "main"

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 28, 2020, 20:12 UTC
Message-ID: <xmqq5z6u9kkv.fsf@gitster.c.googlers.com>
In-Reply-To: <xmqqa6w69l3j.fsf@gitster.c.googlers.com>

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

Show 11 quoted lines

>> +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.