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>,
Patrick Steinhardt <ps@pks•im>,
Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail•com>
Subject: Re: [PATCH v3 0/4] breaking changes: switch default initial branch name to "main"
Date: Wed, 17 Sep 2025 15:53:34 +0100 [thread overview]
Message-ID: <70fa7537-3b89-4c3b-9dea-5a7ea0174a9d@gmail.com> (raw)
In-Reply-To: <xmqqv7lhigb7.fsf@gitster.g>
On 17/09/2025 10:22, Junio C Hamano wrote:
> Junio C Hamano <gitster@pobox•com> writes:
>
> We do this without telling them how to permanently configure the
> default name of the initial branch, and that design choice is very
> much deliberate.
That makes sense
> It also needs to be noted thta the advise token to squelch the
> message is the same advice.defaultBranchName as before, which is
> also very much deliberate. The users who do have that configured
> are those who _have_ been using Git since before 3.0, and they are
> not the target audience for the new advice message. Reusing the
> same advise token ensures that they do not have to turn the message
> off.
That's good
Thanks for following up on this. The code changes look good modulo
the typo pointed out by Kristoffer. I've left a few thoughts on the
test changes below.
> diff --git c/t/t0000-basic.sh w/t/t0000-basic.sh
> index 2b63e1c86c..54ed80ebd4 100755
> --- c/t/t0000-basic.sh
> +++ w/t/t0000-basic.sh
> @@ -220,7 +220,8 @@ test_expect_success 'subtest: --verbose option' '
> test_done
> EOF
> mv t1234-verbose/err t1234-verbose/err+ &&
> - grep -v "^Initialized empty" t1234-verbose/err+ >t1234-verbose/err &&
> + grep -v -e "^Initialized empty" -e "^hint:" t1234-verbose/err+ \
> + >t1234-verbose/err &&
> check_sub_test_lib_test_err t1234-verbose \
> <<-\EOF_OUT 3<<-\EOF_ERR
> > ok 1 - passing test
> diff --git c/t/t0001-init.sh w/t/t0001-init.sh
> index df0040b9ac..5fe7b8c674 100755
> --- c/t/t0001-init.sh
> +++ w/t/t0001-init.sh
> @@ -562,9 +562,9 @@ test_expect_success 'init warns about invalid init.defaultObjectFormat' '
> test_when_finished "rm -rf repo" &&
> test_config_global init.defaultObjectFormat garbage &&
>
> - echo "warning: unknown hash algorithm ${SQ}garbage${SQ}" >expect &&
> + expect="warning: unknown hash algorithm ${SQ}garbage${SQ}" &&
> git init repo 2>err &&
> - test_cmp expect err &&
> + test_grep "$expect" err &&
>
> git -C repo rev-parse --show-object-format >actual &&
> echo $GIT_DEFAULT_HASH >expected &&
> @@ -649,9 +649,9 @@ test_expect_success 'init warns about invalid init.defaultRefFormat' '
> test_when_finished "rm -rf repo" &&
> test_config_global init.defaultRefFormat garbage &&
>
> - echo "warning: unknown ref storage format ${SQ}garbage${SQ}" >expect &&
> + expect="warning: unknown ref storage format ${SQ}garbage${SQ}" &&
> git init repo 2>err &&
> - test_cmp expect err &&
> + test_grep "$expect" err &&
The test changes up to this point strike me as somewhat unfortunate as
these tests are perfectly content with the existing advice. I assume
this stems from us not setting GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
anymore when WITH_BREAKING_CHANGES is enabled. I think we should do
something like
diff --git b/t/test-lib.sh b/t/test-lib.sh
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -127,13 +127,15 @@ then
export GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS
fi
+# Explicitly set the default branch name for testing, to avoid the
+# transitory "git init" warning under --verbose.
if test -z "$WITH_BREAKING_CHANGES"
then
- # Explicitly set the default branch name for testing, to avoid the
- # transitory "git init" warning under --verbose.
: ${GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME:=master}
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+else
+ : ${GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME:=main}
fi
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
################################################################
# It appears that people try to run tests without building...
To address that which will also stop the advice appearing when the
tests are run with --verbose as well.
> git -C repo rev-parse --show-ref-format >actual &&
> echo $GIT_DEFAULT_REF_FORMAT >expected &&
> @@ -868,18 +868,18 @@ test_expect_success 'overridden default initial branch name (config)' '
> grep nmb actual
> '
>
> -test_expect_success !WITH_BREAKING_CHANGES 'advice on unconfigured init.defaultBranch' '
> +test_expect_success 'advice on unconfigured init.defaultBranch' '
> GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= git -c color.advice=always \
> init unconfigured-default-branch-name 2>err &&
> test_decode_color <err >decoded &&
> test_grep "<YELLOW>hint: " decoded
> '
>
> -test_expect_success 'advice on unconfigured init.defaultBranch disabled' '
> +test_expect_success 'advice on unconfigured init.defaultBranch can be disabled' '
> test_when_finished "rm -rf no-advice" &&
>
> GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
> - git -c advice.defaultBranchName=false init no-advice 2>err &&
> + git -c advice.defaultBranchName=false init no-advice 2>err &&
The indentation is changed here but not above. I'd be happy to leave
this alone, but if we're going to remove the indentation here shouldn't
we do the same above?
> test_grep ! "hint: " err
Do we want to check the advice that is printed now that we have two
different messages?
Thanks
Phillip
next prev parent reply other threads:[~2025-09-17 14:53 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
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 [this message]
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=70fa7537-3b89-4c3b-9dea-5a7ea0174a9d@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=kristofferhaugsbakk@fastmail$(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