From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> 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. Git 3.0 will change the default branch name to "main" and remove support for GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME so change these test to use "main" instead of "topic". Signed-off-by: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> --- 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 -- 2.49.0.897.gfad3eb7d210
