From: Phillip Wood <phillip.wood123@gmail•com>
To: Patrick Steinhardt <ps@pks•im>,
Phillip Wood <phillip.wood@dunelm•org.uk>
Cc: git@vger•kernel.org,
Johannes Schindelin <Johannes.Schindelin@gmx•de>,
Wing Huang <huangsen365@gmail•com>,
Junio C Hamano <gitster@pobox•com>
Subject: Re: [PATCH v2 3/4] t9902: switch default branch name to main
Date: Tue, 9 Sep 2025 10:12:34 +0100 [thread overview]
Message-ID: <6914d50d-20bb-40f2-9d52-920f37b6a3f1@gmail.com> (raw)
In-Reply-To: <aLrULt3p_sHvj8r0@pks.im>
On 05/09/2025 13:14, Patrick Steinhardt wrote:
> On Thu, Sep 04, 2025 at 02:21:31PM +0100, Phillip Wood wrote:
>> diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
>> index 6650d33fba6..964e1f15693 100755
>> --- a/t/t9902-completion.sh
>> +++ b/t/t9902-completion.sh
>> @@ -11,9 +11,9 @@ test_description='test bash completion'
>> # untraceable with such ancient Bash versions.
>> test_untraceable=UnfortunatelyYes
>>
>> -# Override environment and always use master for the default initial branch
>> +# Override environment and always use main for the default initial branch
>> # name for these tests, so that rev completion candidates are as expected.
>> -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
>> +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
>> export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
>>
>> . ./lib-bash.sh
>> @@ -1453,7 +1453,7 @@ test_expect_success 'git bisect - start subcommand arguments before double-dash
>> HEAD Z
>> final Z
>> initial Z
>> - master Z
>> + main Z
>> EOF
>> )
>> '
>
> Hm. Wouldn't it be preferable to do something like the below patch
> instead? We would potentially also have to sort the output, but like
> this we don't care about the initial branch name at all.
If we're going to do that then I'd strongly prefer that we have the test
suite set something like TEST_DEFAULT_BRANCH and use that instead of
forking "git branch" or "git symbolic-ref" everywhere. It keeps the
tests cleaner and avoids slowing the test suite down by adding a bunch
of new processes.
As this patch series is focused on removing
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main rather than making tests
independent of the default branch name I'd prefer to leave this patch as is.
Thanks
Phillip
> Patrick
>
> diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
> index 6650d33fba..321005a06a 100755
> --- a/t/t9902-completion.sh
> +++ b/t/t9902-completion.sh
> @@ -11,11 +11,6 @@ test_description='test bash completion'
> # untraceable with such ancient Bash versions.
> test_untraceable=UnfortunatelyYes
>
> -# Override environment and always use master for the default initial branch
> -# name for these tests, so that rev completion candidates are as expected.
> -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
> -export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
> -
> . ./lib-bash.sh
>
> complete ()
> @@ -1449,11 +1444,11 @@ test_expect_success 'setup for git-bisect tests requiring a repo' '
> test_expect_success 'git bisect - start subcommand arguments before double-dash are completed as revs' '
> (
> cd git-bisect &&
> - test_completion "git bisect start " <<-\EOF
> + test_completion "git bisect start " <<-EOF
> HEAD Z
> final Z
> initial Z
> - master Z
> + $(git branch --show-current) Z
> EOF
> )
> '
>
next prev parent reply other threads:[~2025-09-09 9:12 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-27 15:24 [PATCH 0/6] breaking changes: switch default initial branch name to "main" Phillip Wood
2025-08-27 15:24 ` [PATCH 1/6] t0018: switch default branch name to main Phillip Wood
2025-08-27 17:21 ` Junio C Hamano
2025-08-28 14:00 ` Phillip Wood
2025-08-28 16:49 ` Junio C Hamano
2025-08-28 21:31 ` brian m. carlson
2025-08-27 15:24 ` [PATCH 2/6] t4013: " Phillip Wood
2025-08-27 15:24 ` [PATCH 3/6] t9902: " Phillip Wood
2025-08-27 15:24 ` [PATCH 4/6] t0613: stop setting default initial branch Phillip Wood
2025-08-27 17:30 ` Junio C Hamano
2025-08-27 15:24 ` [PATCH 5/6] t1403: remove dependency on GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME Phillip Wood
2025-08-27 15:24 ` [PATCH 6/6] breaking-changes: switch default branch to main Phillip Wood
2025-08-27 18:41 ` Junio C Hamano
2025-09-02 11:36 ` Patrick Steinhardt
2025-09-02 15:13 ` Phillip Wood
2025-09-03 4:44 ` Patrick Steinhardt
2025-09-03 9:54 ` Phillip Wood
2025-09-03 11:51 ` Patrick Steinhardt
2025-09-03 18:40 ` Junio C Hamano
2025-09-04 7:09 ` Patrick Steinhardt
2025-09-04 13:30 ` Phillip Wood
2025-09-05 6:07 ` Patrick Steinhardt
2025-09-04 13:27 ` Phillip Wood
2025-08-28 13:12 ` [PATCH 0/6] breaking changes: switch default initial branch name to "main" Johannes Schindelin
2025-09-04 13:21 ` [PATCH v2 0/4] " Phillip Wood
2025-09-04 13:21 ` [PATCH v2 1/4] breaking-changes: switch default branch to main Phillip Wood
2025-09-04 17:40 ` Junio C Hamano
2025-09-05 10:06 ` Phillip Wood
2025-09-05 15:04 ` Junio C Hamano
2025-09-04 13:21 ` [PATCH v2 2/4] t4013: switch default branch name " Phillip Wood
2025-09-04 13:21 ` [PATCH v2 3/4] t9902: " Phillip Wood
2025-09-04 18:27 ` Junio C Hamano
2025-09-05 10:07 ` Phillip Wood
2025-09-05 12:14 ` Patrick Steinhardt
2025-09-09 9:12 ` Phillip Wood [this message]
2025-09-04 13:21 ` [PATCH v2 4/4] t0613: stop setting default initial branch Phillip Wood
2025-09-04 18:35 ` Junio C Hamano
2025-09-05 10:09 ` Phillip Wood
2025-09-04 17:03 ` [PATCH v2 0/4] breaking changes: switch default initial branch name to "main" Junio C Hamano
2025-09-04 18:47 ` Phillip Wood
2025-09-10 15:28 ` [PATCH v3 " Phillip Wood
2025-09-10 15:29 ` [PATCH v3 1/4] breaking-changes: switch default branch to main Phillip Wood
2025-09-10 15:29 ` [PATCH v3 2/4] t4013: switch default branch name " Phillip Wood
2025-09-10 15:29 ` [PATCH v3 3/4] t9902: " Phillip Wood
2025-09-10 15:29 ` [PATCH v3 4/4] t0613: stop setting default initial branch Phillip Wood
2025-09-10 20:41 ` [PATCH v3 0/4] breaking changes: switch default initial branch name to "main" Junio C Hamano
2025-09-17 9:22 ` Junio C Hamano
2025-09-17 12:02 ` Kristoffer Haugsbakk
2025-09-17 15:02 ` Junio C Hamano
2025-09-17 14:53 ` Phillip Wood
2025-09-17 15:21 ` Junio C Hamano
2025-09-17 16:16 ` Junio C Hamano
2025-09-18 15:06 ` Phillip Wood
2025-09-17 16:18 ` [PATCH v2 5/4] initial branch: give hints after switching the default name Junio C Hamano
2025-09-18 15:06 ` Phillip Wood
2025-09-18 18:42 ` 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=6914d50d-20bb-40f2-9d52-920f37b6a3f1@gmail.com \
--to=phillip.wood123@gmail$(echo .)com \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=huangsen365@gmail$(echo .)com \
--cc=phillip.wood@dunelm$(echo .)org.uk \
--cc=ps@pks$(echo .)im \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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