Re: [PATCH 1/6] t0018: switch default branch name to main
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 27, 2025, 17:21 UTC
- Message-ID
- <xmqq5xe81y0i.fsf@gitster.g>
- In-Reply-To
- <7c20f7693f4518ef79be0a2277515bb00d912213.1756308283.git.phillip.wood@dunelm.org.uk>
Phillip Wood <phillip.wood123@gmail.com> writes:
Show 5 quoted lines
> 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?
> ... 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.
> these test to use "main" instead of "topic".
You meant "trunk" here.
Show 44 quoted lines
> 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