-2

advice.c

··· 51 51 [ADVICE_AM_WORK_DIR] = { "amWorkDir" }, 52 52 [ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME] = { "checkoutAmbiguousRemoteBranchName" }, 53 53 [ADVICE_COMMIT_BEFORE_MERGE] = { "commitBeforeMerge" }, 54 54 - #ifndef WITH_BREAKING_CHANGES 55 54 [ADVICE_DEFAULT_BRANCH_NAME] = { "defaultBranchName" }, 56 56 - #endif /* WITH_BREAKING_CHANGES */ 57 55 [ADVICE_DETACHED_HEAD] = { "detachedHead" }, 58 56 [ADVICE_DIVERGING] = { "diverging" }, 59 57 [ADVICE_FETCH_SET_HEAD_WARN] = { "fetchRemoteHEADWarn" },

+1 -3

advice.h

··· 18 18 ADVICE_AM_WORK_DIR, 19 19 ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME, 20 20 ADVICE_COMMIT_BEFORE_MERGE, 21 21 - #ifndef WITH_BREAKING_CHANGES 22 22 - ADVICE_DEFAULT_BRANCH_NAME, 23 23 - #endif /* WITH_BREAKING_CHANGES */ 21 21 + ADVICE_DEFAULT_BRANCH_NAME, /* To be retired sometime after Git 3.0 */ 24 22 ADVICE_DETACHED_HEAD, 25 23 ADVICE_DIVERGING, 26 24 ADVICE_FETCH_SET_HEAD_WARN,

+10 -2

refs.c

··· 641 641 "\n" 642 642 "\tgit branch -m <name>\n" 643 643 ); 644 644 + #else 645 645 + static const char default_branch_name_advice[] = N_( 646 646 + "Using '%s' as the name for the initial branch since Git 3.0.\n" 647 647 + "If you expected Git to create 'master', the just-created\n" 648 648 + "branch can be renamed via this command:\n" 649 649 + "\n" 650 650 + "\tgit branch -m master\n" 651 651 + ); 644 652 #endif /* WITH_BREAKING_CHANGES */ 645 653 646 646 - char *repo_default_branch_name(struct repository *r, MAYBE_UNUSED int quiet) 654 654 + char *repo_default_branch_name(struct repository *r, int quiet) 647 655 { 648 656 const char *config_key = "init.defaultbranch"; 649 657 const char *config_display_key = "init.defaultBranch"; ··· 660 668 ret = xstrdup("main"); 661 669 #else 662 670 ret = xstrdup("master"); 671 671 + #endif /* WITH_BREAKING_CHANGES */ 663 672 if (!quiet) 664 673 advise_if_enabled(ADVICE_DEFAULT_BRANCH_NAME, 665 674 _(default_branch_name_advice), ret); 666 666 - #endif /* WITH_BREAKING_CHANGES */ 667 675 } 668 676 669 677 full_ref = xstrfmt("refs/heads/%s", ret);

+1 -1

t/t0001-init.sh

··· 868 868 grep nmb actual 869 869 ' 870 870 871 871 - test_expect_success !WITH_BREAKING_CHANGES 'advice on unconfigured init.defaultBranch' ' 871 871 + test_expect_success 'advice on unconfigured init.defaultBranch' ' 872 872 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= git -c color.advice=always \ 873 873 init unconfigured-default-branch-name 2>err && 874 874 test_decode_color <err >decoded &&

+7 -3

t/test-lib.sh

··· 127 127 export GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS 128 128 fi 129 129 130 130 + # Explicitly set the default branch name for testing, to squelch hints 131 131 + # from "git init" during the transition period. Should be removed 132 132 + # after we decide to remove ADVICE_DEFAULT_BRANCH_NAME 130 133 if test -z "$WITH_BREAKING_CHANGES" 131 134 then 132 132 - # Explicitly set the default branch name for testing, to avoid the 133 133 - # transitory "git init" warning under --verbose. 134 135 : ${GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME:=master} 135 135 - export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME 136 136 + else 137 137 + : ${GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME:=main} 136 138 fi 139 139 + export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME 140 140 + 137 141 138 142 ################################################################ 139 143 # It appears that people try to run tests without building...