From: Phillip Wood <phillip.wood123@gmail•com>
To: Junio C Hamano <gitster@pobox•com>
Cc: git@vger•kernel.org,
Johannes Schindelin <Johannes.Schindelin@gmx•de>,
Wing Huang <huangsen365@gmail•com>
Subject: Re: [PATCH 1/6] t0018: switch default branch name to main
Date: Thu, 28 Aug 2025 15:00:08 +0100 [thread overview]
Message-ID: <b6b60e6b-c06d-4dc6-8722-b53736f8b059@gmail.com> (raw)
In-Reply-To: <xmqq5xe81y0i.fsf@gitster.g>
Hi Junio
On 27/08/2025 18:21, Junio C Hamano wrote:
> Phillip Wood <phillip.wood123@gmail•com> writes:
>
>> From: Phillip Wood <phillip.wood@dunelm•org.uk>
>>
>> These tests use "trunk" as the default branch name but the exact
>> name of the branch is incidental to testing if the advice message
>> includes it. ...
>
> Would't we be better prepared for a future where advice messages may
> start including the current branch name, though, if we made sure we
> are on the branch whose name is known?
The advice message does include the current branch name, that's why the
test needs to be updated when we change that name from "trunk" to
"main". The sentence above is trying to say that it does not matter what
that name is, we just need to check it appears in the advice message. I
could see an argument for the tests not depending on git's default
branch name if it changed frequently but realistically we're unlikely to
change in again in the near future. If we did use a different name in
the tests it is just as likely to cause objections and need to be
changed as git's default name so I'm not sure it gains us much.
>> ... Git 3.0 will change the default branch name to "main"
>> and remove support for GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME so change
>
> Will it? I would have expected and hoped that this support won't be
> ripped out. The political atomosphere to decide if a name is
> "correct" will change over time. When somebody comes up with a
> reason to burn 'main', just like everybody moved out of 'master' a
> few years ago, wouldn't we be better off to keep this mechanism?
>
> If we truly believe that we have chosen the forever-perfect name
> that nobody would ever bring up renaming again, we can rip the
> support out. But I am not that optimistic.
If it's another 20 years until we change the default branch is it really
worth supporting this variable until then? I find setting it in tests is
mostly pointless boilerplate. When the variable was introduced in
704fed9ea22 (tests: start moving to a different default main branch
name, 2020-10-23) it was described as "This `GIT_TEST_*` variable is
meant purely for the transitional period while the entire test suite is
converted to use `main` as the initial branch name by default." so I was
hoping we could remove it.
>> these test to use "main" instead of "topic".
>
> You meant "trunk" here.
Will fix
Thanks
Phillip
>> Signed-off-by: Phillip Wood <phillip.wood@dunelm•org.uk>
>> ---
>> t/t0018-advice.sh | 8 ++++----
>> 1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/t/t0018-advice.sh b/t/t0018-advice.sh
>> index f68e08d0b14..c695ade4be8 100755
>> --- a/t/t0018-advice.sh
>> +++ b/t/t0018-advice.sh
>> @@ -2,7 +2,7 @@
>>
>> test_description='Test advise_if_enabled functionality'
>>
>> -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=trunk
>> +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
>> export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
>>
>> . ./test-lib.sh
>> @@ -33,7 +33,7 @@ test_expect_success 'advice should not be printed when config variable is set to
>>
>> test_expect_success 'advice should not be printed when --no-advice is used' '
>> q_to_tab >expect <<-\EOF &&
>> - On branch trunk
>> + On branch main
>>
>> No commits yet
>>
>> @@ -55,7 +55,7 @@ test_expect_success 'advice should not be printed when --no-advice is used' '
>>
>> test_expect_success 'advice should not be printed when GIT_ADVICE is set to false' '
>> q_to_tab >expect <<-\EOF &&
>> - On branch trunk
>> + On branch main
>>
>> No commits yet
>>
>> @@ -77,7 +77,7 @@ test_expect_success 'advice should not be printed when GIT_ADVICE is set to fals
>>
>> test_expect_success 'advice should be printed when GIT_ADVICE is set to true' '
>> q_to_tab >expect <<-\EOF &&
>> - On branch trunk
>> + On branch main
>>
>> No commits yet
next prev parent reply other threads:[~2025-08-28 14:00 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 [this message]
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
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=b6b60e6b-c06d-4dc6-8722-b53736f8b059@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 \
/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