{"thread":{"id":"54464","subject":"[PATCH 01/10] fmt-merge-msg: also suppress \"into main\" by default","startedAt":"2020-10-19T19:31:49Z","lastAt":"2020-10-23T16:00:45Z","messageCount":35,"participants":["Johannes Schindelin via GitGitGadget","Junio C Hamano","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":10},"messages":[{"id":"407894","messageId":"cf950c6f6a48f9a6ad55ac027afbc0640f9a535d.1603135902.git.gitgitgadget@gmail.com","threadId":"54464","inReplyTo":"pull.758.git.1603135902.gitgitgadget@gmail.com","subject":"[PATCH 01/10] fmt-merge-msg: also suppress \"into main\" by default","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-10-19T19:31:32Z","receivedAt":"2020-10-19T19:31:49Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nIn preparation for changing the default branch name to `main`, let's\nskip the suffix \"into main\" in merge commit messages.\n\nSigned-off-by: Johannes Schindelin \n---\n fmt-merge-msg.c | 4 +++-\n 1 file changed, 3 insertions(+), 1 deletion(-)\n\ndiff --git a/fmt-merge-msg.c b/fmt-merge-msg.c\nindex bd22e1ea88..9a664a4a58 100644\n--- a/fmt-merge-msg.c\n+++ b/fmt-merge-msg.c\n@@ -626,8 +626,10 @@ int fmt_merge_msg(struct strbuf *in, struct strbuf *out,\n \tvoid *current_branch_to_free;\n \tstruct merge_parents merge_parents;\n \n-\tif (!suppress_dest_pattern_seen)\n+\tif (!suppress_dest_pattern_seen) {\n+\t\tstring_list_append(&suppress_dest_patterns, \"main\");\n \t\tstring_list_append(&suppress_dest_patterns, \"master\");\n+\t}\n \n \tmemset(&merge_parents, 0, sizeof(merge_parents));\n \n-- \ngitgitgadget\n\n"},{"id":"407895","messageId":"pull.758.git.1603135902.gitgitgadget@gmail.com","threadId":"54464","inReplyTo":null,"subject":"[PATCH 00/10] Prepare for changing the default branch name main (last manual part)","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-10-19T19:31:31Z","receivedAt":"2020-10-19T19:31:49Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"In preparation for changing the default of init.defaultBranch to main, here\nare a couple of manual adjustments that cannot be automated (i.e., these\nadjustments are not mere search-and-replaces).\n\nThis patch series is based on js/default-branch-name-part-3, and is part of\nthe larger effort tracked at https://github.com/gitgitgadget/git/pull/655.\n\nThe next patch series will be largely automated search-and-replaces;\nObviously, the search-and-replace was the easy part, the manual inspection\nwhether the changes are actually correct was much more involved.\n\nWhat to expect next, after this patch series? Essentially, there is the\nlarge patch series that adjusts the entire test suite, with two patch series\nextracted from that effort: t5411 and t5515 simply require too large\npatches, and will therefore be presented as the next patch series after this\none.\n\nJohannes Schindelin (10):\n fmt-merge-msg: also suppress \"into main\" by default\n t9801: use `--` in preparation for default branch rename\n tests: start moving to a different default main branch name\n t4013: prepare for the new default branch name \"main\"\n t6200: adjust suppression pattern to also match \"main\"\n t5703: adjust a test case for the upcoming default branch name\n t3200: prepare for `main` being shorter than `master`\n t9902: prepare a test for the upcoming default branch name\n tests: prepare aligned mentions of the default branch name\n t1400: prepare for `main` being default branch name\n\n fmt-merge-msg.c | 4 +-\n refs.c | 5 +-\n t/lib-submodule-update.sh | 2 +-\n t/t0001-init.sh | 13 +-\n t/t1400-update-ref.sh | 10 +-\n t/t3200-branch.sh | 16 +-\n t/t3201-branch-contains.sh | 8 +-\n t/t3203-branch-output.sh | 4 +-\n t/t3205-branch-color.sh | 8 +-\n t/t4013-diff-various.sh | 177 +++++++++---------\n ...ree_--cc_--patch-with-stat_--summary_main} | 2 +-\n ...iff.diff-tree_--cc_--patch-with-stat_main} | 2 +-\n ...r => diff.diff-tree_--cc_--shortstat_main} | 2 +-\n ...diff.diff-tree_--cc_--stat_--summary_main} | 2 +-\n ...master => diff.diff-tree_--cc_--stat_main} | 2 +-\n ...e_--cc_master => diff.diff-tree_--cc_main} | 2 +-\n ...master => diff.diff-tree_-c_--abbrev_main} | 2 +-\n ...> diff.diff-tree_-c_--stat_--summary_main} | 2 +-\n ...t_master => diff.diff-tree_-c_--stat_main} | 2 +-\n ...-tree_-c_master => diff.diff-tree_-c_main} | 2 +-\n ...-p_-m_master => diff.diff-tree_-p_-m_main} | 2 +-\n t/t4013/diff.diff-tree_-p_main | 2 +\n t/t4013/diff.diff-tree_-p_master | 2 -\n t/t4013/diff.diff-tree_main | 2 +\n t/t4013/diff.diff-tree_master | 2 -\n t/t4013/diff.diff_--dirstat_--cc_main~1_main | 3 +\n .../diff.diff_--dirstat_--cc_master~1_master | 3 -\n t/t4013/diff.diff_--dirstat_main~1_main~2 | 3 +\n t/t4013/diff.diff_--dirstat_master~1_master~2 | 3 -\n ...ff.diff_--line-prefix=abc_main_main^_side} | 2 +-\n ...master^_side => diff.diff_main_main^_side} | 2 +-\n ...mat-patch_--attach_--stdout_initial..main} | 2 +-\n ...at-patch_--attach_--stdout_initial..main^} | 2 +-\n ...e_--stdout_--numbered-files_initial..main} | 2 +-\n ...t_--subject-prefix=TESTCASE_initial..main} | 2 +-\n ...mat-patch_--inline_--stdout_initial..main} | 2 +-\n ...at-patch_--inline_--stdout_initial..main^} | 2 +-\n ...t-patch_--inline_--stdout_initial..main^^} | 2 +-\n ...--stdout_--cover-letter_-n_initial..main^} | 2 +-\n ...atch_--stdout_--no-numbered_initial..main} | 2 +-\n ...t-patch_--stdout_--numbered_initial..main} | 2 +-\n ... diff.format-patch_--stdout_initial..main} | 2 +-\n ...diff.format-patch_--stdout_initial..main^} | 2 +-\n t/t4013/diff.log_--decorate=full_--all | 2 +-\n t/t4013/diff.log_--decorate_--all | 2 +-\n ..._--diff-merges=off_-p_--first-parent_main} | 2 +-\n ..._--first-parent_--diff-merges=off_-p_main} | 2 +-\n ...g_--no-diff-merges_-p_--first-parent_main} | 2 +-\n ..._--patch-with-stat_--summary_main_--_dir_} | 2 +-\n ...master => diff.log_--patch-with-stat_main} | 2 +-\n ...> diff.log_--patch-with-stat_main_--_dir_} | 2 +-\n ...oot_--cc_--patch-with-stat_--summary_main} | 2 +-\n ...g_--root_--patch-with-stat_--summary_main} | 2 +-\n ...=> diff.log_--root_--patch-with-stat_main} | 2 +-\n ...-root_-c_--patch-with-stat_--summary_main} | 2 +-\n ...root_-p_master => diff.log_--root_-p_main} | 2 +-\n ...log_--root_master => diff.log_--root_main} | 2 +-\n ...ter => diff.log_-GF_-p_--pickaxe-all_main} | 2 +-\n ...log_-GF_-p_master => diff.log_-GF_-p_main} | 2 +-\n ...{diff.log_-SF_master => diff.log_-GF_main} | 2 +-\n ...log_-SF_-p_master => diff.log_-SF_-p_main} | 2 +-\n ...{diff.log_-GF_master => diff.log_-SF_main} | 2 +-\n t/t4013/diff.log_-SF_main_--max-count=0 | 2 +\n ...ount=2 => diff.log_-SF_main_--max-count=1} | 2 +-\n t/t4013/diff.log_-SF_main_--max-count=2 | 7 +\n t/t4013/diff.log_-SF_master_--max-count=0 | 2 -\n t/t4013/diff.log_-SF_master_--max-count=1 | 7 -\n ...iff.log_-S_F_master => diff.log_-S_F_main} | 2 +-\n ...ter => diff.log_-m_-p_--first-parent_main} | 2 +-\n ...f.log_-m_-p_master => diff.log_-m_-p_main} | 2 +-\n ...master => diff.log_-p_--first-parent_main} | 2 +-\n .../{diff.log_-p_master => diff.log_-p_main} | 2 +-\n t/t4013/{diff.log_master => diff.log_main} | 2 +-\n ...iff.noellipses-diff-tree_-c_--abbrev_main} | 2 +-\n ...> diff.noellipses-whatchanged_--root_main} | 2 +-\n ...r => diff.noellipses-whatchanged_-SF_main} | 2 +-\n ...aster => diff.noellipses-whatchanged_main} | 2 +-\n ...t_master => diff.show_--first-parent_main} | 2 +-\n ...{diff.show_-c_master => diff.show_-c_main} | 2 +-\n ...{diff.show_-m_master => diff.show_-m_main} | 2 +-\n t/t4013/{diff.show_master => diff.show_main} | 2 +-\n ..._--patch-with-stat_--summary_main_--_dir_} | 2 +-\n ...> diff.whatchanged_--patch-with-stat_main} | 2 +-\n ...hatchanged_--patch-with-stat_main_--_dir_} | 2 +-\n ...oot_--cc_--patch-with-stat_--summary_main} | 2 +-\n ...d_--root_--patch-with-stat_--summary_main} | 2 +-\n ...whatchanged_--root_--patch-with-stat_main} | 2 +-\n ...-root_-c_--patch-with-stat_--summary_main} | 2 +-\n ...master => diff.whatchanged_--root_-p_main} | 2 +-\n ...ot_master => diff.whatchanged_--root_main} | 2 +-\n ...-p_master => diff.whatchanged_-SF_-p_main} | 2 +-\n ...d_-SF_master => diff.whatchanged_-SF_main} | 2 +-\n ...ged_-p_master => diff.whatchanged_-p_main} | 2 +-\n ...atchanged_master => diff.whatchanged_main} | 2 +-\n t/t5505-remote.sh | 30 +--\n t/t5510-fetch.sh | 8 +-\n t/t5526-fetch-submodules.sh | 70 +++----\n t/t5606-clone-options.sh | 3 +\n t/t5703-upload-pack-ref-in-want.sh | 6 +-\n t/t6200-fmt-merge-msg.sh | 2 +-\n t/t6302-for-each-ref-filter.sh | 24 +--\n t/t9801-git-p4-branch.sh | 12 +-\n t/t9902-completion.sh | 6 +-\n t/test-lib.sh | 7 +\n 104 files changed, 311 insertions(+), 286 deletions(-)\n rename t/t4013/{diff.diff-tree_--cc_--patch-with-stat_--summary_master => diff.diff-tree_--cc_--patch-with-stat_--summary_main} (86%)\n rename t/t4013/{diff.diff-tree_--cc_--patch-with-stat_master => diff.diff-tree_--cc_--patch-with-stat_main} (89%)\n rename t/t4013/{diff.diff-tree_--cc_--shortstat_master => diff.diff-tree_--cc_--shortstat_main} (65%)\n rename t/t4013/{diff.diff-tree_-c_--stat_--summary_master => diff.diff-tree_--cc_--stat_--summary_main} (71%)\n rename t/t4013/{diff.diff-tree_-c_--stat_master => diff.diff-tree_--cc_--stat_main} (76%)\n rename t/t4013/{diff.diff-tree_--cc_master => diff.diff-tree_--cc_main} (91%)\n rename t/t4013/{diff.diff-tree_-c_--abbrev_master => diff.diff-tree_-c_--abbrev_main} (83%)\n rename t/t4013/{diff.diff-tree_--cc_--stat_--summary_master => diff.diff-tree_-c_--stat_--summary_main} (70%)\n rename t/t4013/{diff.diff-tree_--cc_--stat_master => diff.diff-tree_-c_--stat_main} (75%)\n rename t/t4013/{diff.diff-tree_-c_master => diff.diff-tree_-c_main} (93%)\n rename t/t4013/{diff.diff-tree_-p_-m_master => diff.diff-tree_-p_-m_main} (97%)\n create mode 100644 t/t4013/diff.diff-tree_-p_main\n delete mode 100644 t/t4013/diff.diff-tree_-p_master\n create mode 100644 t/t4013/diff.diff-tree_main\n delete mode 100644 t/t4013/diff.diff-tree_master\n create mode 100644 t/t4013/diff.diff_--dirstat_--cc_main~1_main\n delete mode 100644 t/t4013/diff.diff_--dirstat_--cc_master~1_master\n create mode 100644 t/t4013/diff.diff_--dirstat_main~1_main~2\n delete mode 100644 t/t4013/diff.diff_--dirstat_master~1_master~2\n rename t/t4013/{diff.diff_--line-prefix=abc_master_master^_side => diff.diff_--line-prefix=abc_main_main^_side} (87%)\n rename t/t4013/{diff.diff_master_master^_side => diff.diff_main_main^_side} (89%)\n rename t/t4013/{diff.format-patch_--attach_--stdout_initial..master => diff.format-patch_--attach_--stdout_initial..main} (98%)\n rename t/t4013/{diff.format-patch_--attach_--stdout_initial..master^ => diff.format-patch_--attach_--stdout_initial..main^} (97%)\n rename t/t4013/{diff.format-patch_--inline_--stdout_--numbered-files_initial..master => diff.format-patch_--inline_--stdout_--numbered-files_initial..main} (99%)\n rename t/t4013/{diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master => diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..main} (99%)\n rename t/t4013/{diff.format-patch_--inline_--stdout_initial..master => diff.format-patch_--inline_--stdout_initial..main} (98%)\n rename t/t4013/{diff.format-patch_--inline_--stdout_initial..master^ => diff.format-patch_--inline_--stdout_initial..main^} (97%)\n rename t/t4013/{diff.format-patch_--inline_--stdout_initial..master^^ => diff.format-patch_--inline_--stdout_initial..main^^} (95%)\n rename t/t4013/{diff.format-patch_--stdout_--cover-letter_-n_initial..master^ => diff.format-patch_--stdout_--cover-letter_-n_initial..main^} (96%)\n rename t/t4013/{diff.format-patch_--stdout_--no-numbered_initial..master => diff.format-patch_--stdout_--no-numbered_initial..main} (97%)\n rename t/t4013/{diff.format-patch_--stdout_--numbered_initial..master => diff.format-patch_--stdout_--numbered_initial..main} (97%)\n rename t/t4013/{diff.format-patch_--stdout_initial..master => diff.format-patch_--stdout_initial..main} (97%)\n rename t/t4013/{diff.format-patch_--stdout_initial..master^ => diff.format-patch_--stdout_initial..main^} (96%)\n rename t/t4013/{diff.log_--no-diff-merges_-p_--first-parent_master => diff.log_--diff-merges=off_-p_--first-parent_main} (95%)\n rename t/t4013/{diff.log_--first-parent_--diff-merges=off_-p_master => diff.log_--first-parent_--diff-merges=off_-p_main} (95%)\n rename t/t4013/{diff.log_--diff-merges=off_-p_--first-parent_master => diff.log_--no-diff-merges_-p_--first-parent_main} (95%)\n rename t/t4013/{diff.log_--patch-with-stat_--summary_master_--_dir_ => diff.log_--patch-with-stat_--summary_main_--_dir_} (96%)\n rename t/t4013/{diff.log_--patch-with-stat_master => diff.log_--patch-with-stat_main} (98%)\n rename t/t4013/{diff.log_--patch-with-stat_master_--_dir_ => diff.log_--patch-with-stat_main_--_dir_} (96%)\n rename t/t4013/{diff.log_--root_--cc_--patch-with-stat_--summary_master => diff.log_--root_--cc_--patch-with-stat_--summary_main} (98%)\n rename t/t4013/{diff.log_--root_--patch-with-stat_--summary_master => diff.log_--root_--patch-with-stat_--summary_main} (98%)\n rename t/t4013/{diff.log_--root_--patch-with-stat_master => diff.log_--root_--patch-with-stat_main} (98%)\n rename t/t4013/{diff.log_--root_-c_--patch-with-stat_--summary_master => diff.log_--root_-c_--patch-with-stat_--summary_main} (98%)\n rename t/t4013/{diff.log_--root_-p_master => diff.log_--root_-p_main} (98%)\n rename t/t4013/{diff.log_--root_master => diff.log_--root_main} (96%)\n rename t/t4013/{diff.log_-GF_-p_--pickaxe-all_master => diff.log_-GF_-p_--pickaxe-all_main} (90%)\n rename t/t4013/{diff.log_-GF_-p_master => diff.log_-GF_-p_main} (91%)\n rename t/t4013/{diff.log_-SF_master => diff.log_-GF_main} (86%)\n rename t/t4013/{diff.log_-SF_-p_master => diff.log_-SF_-p_main} (91%)\n rename t/t4013/{diff.log_-GF_master => diff.log_-SF_main} (86%)\n create mode 100644 t/t4013/diff.log_-SF_main_--max-count=0\n rename t/t4013/{diff.log_-SF_master_--max-count=2 => diff.log_-SF_main_--max-count=1} (79%)\n create mode 100644 t/t4013/diff.log_-SF_main_--max-count=2\n delete mode 100644 t/t4013/diff.log_-SF_master_--max-count=0\n delete mode 100644 t/t4013/diff.log_-SF_master_--max-count=1\n rename t/t4013/{diff.log_-S_F_master => diff.log_-S_F_main} (86%)\n rename t/t4013/{diff.log_-m_-p_--first-parent_master => diff.log_-m_-p_--first-parent_main} (97%)\n rename t/t4013/{diff.log_-m_-p_master => diff.log_-m_-p_main} (99%)\n rename t/t4013/{diff.log_-p_--first-parent_master => diff.log_-p_--first-parent_main} (97%)\n rename t/t4013/{diff.log_-p_master => diff.log_-p_main} (98%)\n rename t/t4013/{diff.log_master => diff.log_main} (97%)\n rename t/t4013/{diff.noellipses-diff-tree_-c_--abbrev_master => diff.noellipses-diff-tree_-c_--abbrev_main} (81%)\n rename t/t4013/{diff.noellipses-whatchanged_--root_master => diff.noellipses-whatchanged_--root_main} (96%)\n rename t/t4013/{diff.noellipses-whatchanged_-SF_master => diff.noellipses-whatchanged_-SF_main} (86%)\n rename t/t4013/{diff.noellipses-whatchanged_master => diff.noellipses-whatchanged_main} (96%)\n rename t/t4013/{diff.show_--first-parent_master => diff.show_--first-parent_main} (92%)\n rename t/t4013/{diff.show_-c_master => diff.show_-c_main} (95%)\n rename t/t4013/{diff.show_-m_master => diff.show_-m_main} (98%)\n rename t/t4013/{diff.show_master => diff.show_main} (96%)\n rename t/t4013/{diff.whatchanged_--patch-with-stat_--summary_master_--_dir_ => diff.whatchanged_--patch-with-stat_--summary_main_--_dir_} (94%)\n rename t/t4013/{diff.whatchanged_--patch-with-stat_master => diff.whatchanged_--patch-with-stat_main} (97%)\n rename t/t4013/{diff.whatchanged_--patch-with-stat_master_--_dir_ => diff.whatchanged_--patch-with-stat_main_--_dir_} (94%)\n rename t/t4013/{diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master => diff.whatchanged_--root_--cc_--patch-with-stat_--summary_main} (97%)\n rename t/t4013/{diff.whatchanged_--root_--patch-with-stat_--summary_master => diff.whatchanged_--root_--patch-with-stat_--summary_main} (97%)\n rename t/t4013/{diff.whatchanged_--root_--patch-with-stat_master => diff.whatchanged_--root_--patch-with-stat_main} (97%)\n rename t/t4013/{diff.whatchanged_--root_-c_--patch-with-stat_--summary_master => diff.whatchanged_--root_-c_--patch-with-stat_--summary_main} (97%)\n rename t/t4013/{diff.whatchanged_--root_-p_master => diff.whatchanged_--root_-p_main} (98%)\n rename t/t4013/{diff.whatchanged_--root_master => diff.whatchanged_--root_main} (97%)\n rename t/t4013/{diff.whatchanged_-SF_-p_master => diff.whatchanged_-SF_-p_main} (89%)\n rename t/t4013/{diff.whatchanged_-SF_master => diff.whatchanged_-SF_main} (86%)\n rename t/t4013/{diff.whatchanged_-p_master => diff.whatchanged_-p_main} (98%)\n rename t/t4013/{diff.whatchanged_master => diff.whatchanged_main} (97%)\n\n\nbase-commit: 538228ed23a1d5e17e89bb17086d4dda51325bd8\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-758%2Fdscho%2Fprepare-for-main-branch-manual-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-758/dscho/prepare-for-main-branch-manual-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/758\n-- \ngitgitgadget\n"},{"id":"407896","messageId":"5849eda331e09732026f0432cf1040a4e973a702.1603135902.git.gitgitgadget@gmail.com","threadId":"54464","inReplyTo":"pull.758.git.1603135902.gitgitgadget@gmail.com","subject":"[PATCH 02/10] t9801: use `--` in preparation for default branch rename","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-10-19T19:31:33Z","receivedAt":"2020-10-19T19:31:50Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nSeeing as we want to use `main` as the new default branch name used by\n`git init`, and that `main` is used as directory name in t9801, let's\ntighten the rev-list arguments to make it explicit when we are referring\nto a ref instead of a directory.\n\nSigned-off-by: Johannes Schindelin \n---\n t/t9801-git-p4-branch.sh | 12 ++++++------\n 1 file changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh\nindex 67ff2711f5..a3abd778f9 100755\n--- a/t/t9801-git-p4-branch.sh\n+++ b/t/t9801-git-p4-branch.sh\n@@ -67,7 +67,7 @@ test_expect_success 'import main, no branch detection' '\n \t(\n \t\tcd \"$git\" &&\n \t\tgit log --oneline --graph --decorate --all &&\n-\t\tgit rev-list master >wc &&\n+\t\tgit rev-list master -- >wc &&\n \t\ttest_line_count = 4 wc\n \t)\n '\n@@ -78,7 +78,7 @@ test_expect_success 'import branch1, no branch detection' '\n \t(\n \t\tcd \"$git\" &&\n \t\tgit log --oneline --graph --decorate --all &&\n-\t\tgit rev-list master >wc &&\n+\t\tgit rev-list master -- >wc &&\n \t\ttest_line_count = 2 wc\n \t)\n '\n@@ -89,7 +89,7 @@ test_expect_success 'import branch2, no branch detection' '\n \t(\n \t\tcd \"$git\" &&\n \t\tgit log --oneline --graph --decorate --all &&\n-\t\tgit rev-list master >wc &&\n+\t\tgit rev-list master -- >wc &&\n \t\ttest_line_count = 2 wc\n \t)\n '\n@@ -100,7 +100,7 @@ test_expect_success 'import depot, no branch detection' '\n \t(\n \t\tcd \"$git\" &&\n \t\tgit log --oneline --graph --decorate --all &&\n-\t\tgit rev-list master >wc &&\n+\t\tgit rev-list master -- >wc &&\n \t\ttest_line_count = 8 wc\n \t)\n '\n@@ -114,7 +114,7 @@ test_expect_success 'import depot, branch detection' '\n \t\tgit log --oneline --graph --decorate --all &&\n \n \t\t# 4 main commits\n-\t\tgit rev-list master >wc &&\n+\t\tgit rev-list master -- >wc &&\n \t\ttest_line_count = 4 wc &&\n \n \t\t# 3 main, 1 integrate, 1 on branch2\n@@ -137,7 +137,7 @@ test_expect_success 'import depot, branch detection, branchList branch definitio\n \t\tgit log --oneline --graph --decorate --all &&\n \n \t\t# 4 main commits\n-\t\tgit rev-list master >wc &&\n+\t\tgit rev-list master -- >wc &&\n \t\ttest_line_count = 4 wc &&\n \n \t\t# 3 main, 1 integrate, 1 on branch2\n-- \ngitgitgadget\n\n"},{"id":"407897","messageId":"d9469202c2dda238882150452fac1aa7fc7fbfec.1603135902.git.gitgitgadget@gmail.com","threadId":"54464","inReplyTo":"pull.758.git.1603135902.gitgitgadget@gmail.com","subject":"[PATCH 03/10] tests: start moving to a different default main branch name","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-10-19T19:31:34Z","receivedAt":"2020-10-19T19:31:52Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nTo allow for an incremental conversion to a new default main branch\nname, let's introduce `GIT_TEST_DEFAULT_MAIN_BRANCH_NAME`. This\nenvironment variable can be set at the top of each converted test\nscript, overriding the default main branch name to use when initializing\nnew repositories (or cloning empty repositories).\n\nNote: the `GIT_TEST_DEFAULT_MAIN_BRANCH_NAME` is _not_ intended to be\nused manually; many tests require a specific main branch name and cannot\nsimply work with another one. This `GIT_TEST_*` variable is meant purely\nfor the transitional period while the entire test suite is converted to\nuse `main` as the initial branch name by default.\n\nWe also introduce the `PREPARE_FOR_MAIN_BRANCH` prereq that determines\nwhether the default main branch name is `main`, and adjust a couple of\ntest functions to use it. This prereq will be used to temporarily\ndisable a couple test cases to allow for adjusting the test script\nincrementally. Once an entire test is adjusted, we will adjust the test\nso that it is run with `GIT_TEST_DEFAULT_MAIN_BRANCH_NAME=main`.\n\nSigned-off-by: Johannes Schindelin \n---\n refs.c | 5 ++++-\n t/lib-submodule-update.sh | 2 +-\n t/t0001-init.sh | 13 ++++++++++---\n t/t5606-clone-options.sh | 3 +++\n t/test-lib.sh | 7 +++++++\n 5 files changed, 25 insertions(+), 5 deletions(-)\n\ndiff --git a/refs.c b/refs.c\nindex fa01153151..392f0bbf68 100644\n--- a/refs.c\n+++ b/refs.c\n@@ -567,8 +567,11 @@ char *repo_default_branch_name(struct repository *r)\n \tconst char *config_key = \"init.defaultbranch\";\n \tconst char *config_display_key = \"init.defaultBranch\";\n \tchar *ret = NULL, *full_ref;\n+\tconst char *env = getenv(\"GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\");\n \n-\tif (repo_config_get_string(r, config_key, &ret) < 0)\n+\tif (env && *env)\n+\t\tret = xstrdup(env);\n+\telse if (repo_config_get_string(r, config_key, &ret) < 0)\n \t\tdie(_(\"could not retrieve `%s`\"), config_display_key);\n \n \tif (!ret)\ndiff --git a/t/lib-submodule-update.sh b/t/lib-submodule-update.sh\nindex 87a759149f..bd3fa3c6da 100644\n--- a/t/lib-submodule-update.sh\n+++ b/t/lib-submodule-update.sh\n@@ -144,7 +144,7 @@ create_lib_submodule_repo () {\n \t\tgit checkout -b valid_sub1 &&\n \t\tgit revert HEAD &&\n \n-\t\tgit checkout master\n+\t\tgit checkout \"${GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME-master}\"\n \t)\n }\n \ndiff --git a/t/t0001-init.sh b/t/t0001-init.sh\nindex 2f7c3dcd0f..69a320489f 100755\n--- a/t/t0001-init.sh\n+++ b/t/t0001-init.sh\n@@ -553,14 +553,21 @@ test_expect_success '--initial-branch' '\n \n test_expect_success 'overridden default initial branch name (config)' '\n \ttest_config_global init.defaultBranch nmb &&\n-\tgit init initial-branch-config &&\n+\tGIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= git init initial-branch-config &&\n \tgit -C initial-branch-config symbolic-ref HEAD >actual &&\n \tgrep nmb actual\n '\n \n+test_expect_success 'overridden default main branch name (env)' '\n+\ttest_config_global init.defaultBranch nmb &&\n+\tGIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=env git init main-branch-env &&\n+\tgit -C main-branch-env symbolic-ref HEAD >actual &&\n+\tgrep env actual\n+'\n+\n test_expect_success 'invalid default branch name' '\n-\ttest_config_global init.defaultBranch \"with space\" &&\n-\ttest_must_fail git init initial-branch-invalid 2>err &&\n+\ttest_must_fail env GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=\"with space\" \\\n+\t\tgit init initial-branch-invalid 2>err &&\n \ttest_i18ngrep \"invalid branch name\" err\n '\n \ndiff --git a/t/t5606-clone-options.sh b/t/t5606-clone-options.sh\nindex e69427f881..856eebf222 100755\n--- a/t/t5606-clone-options.sh\n+++ b/t/t5606-clone-options.sh\n@@ -37,6 +37,7 @@ test_expect_success 'redirected clone -v does show progress' '\n \n test_expect_success 'chooses correct default initial branch name' '\n \tgit init --bare empty &&\n+\tGIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \\\n \tgit -c init.defaultBranch=up clone empty whats-up &&\n \ttest refs/heads/up = $(git -C whats-up symbolic-ref HEAD) &&\n \ttest refs/heads/up = $(git -C whats-up config branch.up.merge)\n@@ -51,9 +52,11 @@ test_expect_success 'guesses initial branch name correctly' '\n \n \tgit -c init.defaultBranch=none init --bare no-head &&\n \tgit -C initial-branch push ../no-head guess abc &&\n+\tGIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \\\n \tgit clone no-head is-it2 &&\n \ttest_must_fail git -C is-it2 symbolic-ref refs/remotes/origin/HEAD &&\n \tgit -C no-head update-ref --no-deref HEAD refs/heads/guess &&\n+\tGIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \\\n \tgit -c init.defaultBranch=guess clone no-head is-it3 &&\n \ttest refs/remotes/origin/guess = \\\n \t\t$(git -C is-it3 symbolic-ref refs/remotes/origin/HEAD)\ndiff --git a/t/test-lib.sh b/t/test-lib.sh\nindex ef31f40037..6b35070d22 100644\n--- a/t/test-lib.sh\n+++ b/t/test-lib.sh\n@@ -1702,3 +1702,10 @@ test_lazy_prereq SHA1 '\n test_lazy_prereq REBASE_P '\n \ttest -z \"$GIT_TEST_SKIP_REBASE_P\"\n '\n+# Special-purpose prereq for transitioning to a new default branch name:\n+# Some tests need more than just a mindless (case-preserving) s/master/main/g\n+# replacement. The non-trivial adjustments are guarded behind this\n+# prerequisite, acting kind of as a feature flag\n+test_lazy_prereq PREPARE_FOR_MAIN_BRANCH '\n+\ttest \"$GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\" = main\n+'\n-- \ngitgitgadget\n\n"},{"id":"407898","messageId":"7860d8d7df43075ad5424d8210d6f6e17c2042db.1603135903.git.gitgitgadget@gmail.com","threadId":"54464","inReplyTo":"pull.758.git.1603135902.gitgitgadget@gmail.com","subject":"[PATCH 05/10] t6200: adjust suppression pattern to also match \"main\"","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-10-19T19:31:36Z","receivedAt":"2020-10-19T19:31:54Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nIn preparation to running t6200 with the default branch name set to\n\"main\", let's adjust the only non-trivial aspect thereof. The rest will\nbe done via a trivial `sed` invocation.\n\nSigned-off-by: Johannes Schindelin \n---\n t/t6200-fmt-merge-msg.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh\nindex 7d549748ef..e61f8fb3d0 100755\n--- a/t/t6200-fmt-merge-msg.sh\n+++ b/t/t6200-fmt-merge-msg.sh\n@@ -556,7 +556,7 @@ test_expect_success 'merge.suppressDest configuration' '\n \thead -n1 full.2 >actual &&\n \tgrep -e \"Merge branch .side. into master$\" actual &&\n \n-\tgit -c merge.suppressDest=\"ma??er\" fmt-merge-msg <.git/FETCH_HEAD >full.3 &&\n+\tgit -c merge.suppressDest=\"ma*\" fmt-merge-msg <.git/FETCH_HEAD >full.3 &&\n \thead -n1 full.3 >actual &&\n \tgrep -e \"Merge branch .side.\" actual &&\n \t! grep -e \" into master$\" actual\n-- \ngitgitgadget\n\n"},{"id":"407899","messageId":"0d2511d18fb2908b1049afe4da7494f6ed7e26e8.1603135903.git.gitgitgadget@gmail.com","threadId":"54464","inReplyTo":"pull.758.git.1603135902.gitgitgadget@gmail.com","subject":"[PATCH 06/10] t5703: adjust a test case for the upcoming default branch name","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-10-19T19:31:37Z","receivedAt":"2020-10-19T19:31:56Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nWe want to rename the default branch name used by `git init` in the near\nfuture, using `main` as the new name.\n\nIn preparation for that, we adjust a test case that wants to rename the\ndefault branch to a different name that however has the same length. We\nuse `none` as that name because it matches the length of `main`.\n\nAs this test case cannot possibly pass until the default branch name is\n_actually_ changed, we temporarily guard it behind a special-purpose\nprereq, until the test suite is fully converted to use that new default\nbranch name.\n\nSigned-off-by: Johannes Schindelin \n---\n t/t5703-upload-pack-ref-in-want.sh | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/t/t5703-upload-pack-ref-in-want.sh b/t/t5703-upload-pack-ref-in-want.sh\nindex d9ecf0f4a9..67f83e7c9b 100755\n--- a/t/t5703-upload-pack-ref-in-want.sh\n+++ b/t/t5703-upload-pack-ref-in-want.sh\n@@ -383,14 +383,14 @@ test_expect_success 'server is initially behind - ref in want' '\n \ttest_cmp expected actual\n '\n \n-test_expect_success 'server loses a ref - ref in want' '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH 'server loses a ref - ref in want' '\n \tgit -C \"$REPO\" config uploadpack.allowRefInWant true &&\n \trm -rf local &&\n \tcp -r \"$LOCAL_PRISTINE\" local &&\n-\techo \"s/master/raster/\" >\"$HTTPD_ROOT_PATH/one-time-perl\" &&\n+\techo \"s/main/none/\" >\"$HTTPD_ROOT_PATH/one-time-perl\" &&\n \ttest_must_fail git -C local fetch 2>err &&\n \n-\ttest_i18ngrep \"fatal: remote error: unknown ref refs/heads/raster\" err\n+\ttest_i18ngrep \"fatal: remote error: unknown ref refs/heads/none\" err\n '\n \n # DO NOT add non-httpd-specific tests here, because the last part of this\n-- \ngitgitgadget\n\n"},{"id":"407900","messageId":"e1740bb7d7d8c90db68ffff443b69894177e36f3.1603135903.git.gitgitgadget@gmail.com","threadId":"54464","inReplyTo":"pull.758.git.1603135902.gitgitgadget@gmail.com","subject":"[PATCH 07/10] t3200: prepare for `main` being shorter than `master`","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-10-19T19:31:38Z","receivedAt":"2020-10-19T19:31:56Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nIn the test case adjusted by this patch, we want to cut just after the\nlongest shown ref name. Since `main` is shorter than `master`, we need\nto decrease the number of characters. Since `main2` is shown, too, and\nsince that is only one character shorter than `master`, we decrement the\nlength by one.\n\nSigned-off-by: Johannes Schindelin \n---\n t/t3200-branch.sh | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/t/t3200-branch.sh b/t/t3200-branch.sh\nindex 6efe7a44bc..55b24b76ce 100755\n--- a/t/t3200-branch.sh\n+++ b/t/t3200-branch.sh\n@@ -375,9 +375,9 @@ test_expect_success 'git branch --column -v should fail' '\n \ttest_must_fail git branch --column -v\n '\n \n-test_expect_success 'git branch -v with column.ui ignored' '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH 'git branch -v with column.ui ignored' '\n \tgit config column.ui column &&\n-\tCOLUMNS=80 git branch -v | cut -c -9 | sed \"s/ *$//\" >actual &&\n+\tCOLUMNS=80 git branch -v | cut -c -8 | sed \"s/ *$//\" >actual &&\n \tgit config --unset column.ui &&\n \tcat >expect <<\\EOF &&\n a/b/c\n-- \ngitgitgadget\n\n"},{"id":"407904","messageId":"baeb01f70646ce0c7564f1a1f820fb011e124d97.1603135902.git.gitgitgadget@gmail.com","threadId":"54464","inReplyTo":"pull.758.git.1603135902.gitgitgadget@gmail.com","subject":"[PATCH 04/10] t4013: prepare for the new default branch name \"main\"","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-10-19T19:31:35Z","receivedAt":"2020-10-19T19:31:59Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nThis patch is a bit involved, mainly because the default branch name is\nnot only hard-coded in the script `t4013-diff-various.sh` itself, and\nnot only in the support files in `t/t4013/`, but also in the _file\nnames_ in `t/t4013/`.\n\nThe trick to adjust this test script was performed by inserting the\ndefinition GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main at the beginning of\nthe test script, and then running these commands:\n\n(cd t &&\n sed -i 's/master/main/g' -- \\\n\t$(git grep -l master HEAD -- ./t4013\\* | sed 's/HEAD://'))\n\nand\n\neval \"$(git ls-files t/t4013/ | sed -n \\\n\t-e 's/\\(.*\\)master\\(.*\\)master\\(.*\\)/git mv & \\1main\\2main\\3;/p')\"\n\nand\n\neval \"$(git ls-files t/t4013/ | sed -n \\\n\t-e 's/\\(.*\\)master\\(.*\\)/git mv & \\1main\\2;/p')\"\n\nSigned-off-by: Johannes Schindelin \n---\n t/t4013-diff-various.sh | 177 +++++++++---------\n ...ree_--cc_--patch-with-stat_--summary_main} | 2 +-\n ...iff.diff-tree_--cc_--patch-with-stat_main} | 2 +-\n ...r => diff.diff-tree_--cc_--shortstat_main} | 2 +-\n ...diff.diff-tree_--cc_--stat_--summary_main} | 2 +-\n ...master => diff.diff-tree_--cc_--stat_main} | 2 +-\n ...e_--cc_master => diff.diff-tree_--cc_main} | 2 +-\n ...master => diff.diff-tree_-c_--abbrev_main} | 2 +-\n ...> diff.diff-tree_-c_--stat_--summary_main} | 2 +-\n ...t_master => diff.diff-tree_-c_--stat_main} | 2 +-\n ...-tree_-c_master => diff.diff-tree_-c_main} | 2 +-\n ...-p_-m_master => diff.diff-tree_-p_-m_main} | 2 +-\n t/t4013/diff.diff-tree_-p_main | 2 +\n t/t4013/diff.diff-tree_-p_master | 2 -\n t/t4013/diff.diff-tree_main | 2 +\n t/t4013/diff.diff-tree_master | 2 -\n t/t4013/diff.diff_--dirstat_--cc_main~1_main | 3 +\n .../diff.diff_--dirstat_--cc_master~1_master | 3 -\n t/t4013/diff.diff_--dirstat_main~1_main~2 | 3 +\n t/t4013/diff.diff_--dirstat_master~1_master~2 | 3 -\n ...ff.diff_--line-prefix=abc_main_main^_side} | 2 +-\n ...master^_side => diff.diff_main_main^_side} | 2 +-\n ...mat-patch_--attach_--stdout_initial..main} | 2 +-\n ...at-patch_--attach_--stdout_initial..main^} | 2 +-\n ...e_--stdout_--numbered-files_initial..main} | 2 +-\n ...t_--subject-prefix=TESTCASE_initial..main} | 2 +-\n ...mat-patch_--inline_--stdout_initial..main} | 2 +-\n ...at-patch_--inline_--stdout_initial..main^} | 2 +-\n ...t-patch_--inline_--stdout_initial..main^^} | 2 +-\n ...--stdout_--cover-letter_-n_initial..main^} | 2 +-\n ...atch_--stdout_--no-numbered_initial..main} | 2 +-\n ...t-patch_--stdout_--numbered_initial..main} | 2 +-\n ... diff.format-patch_--stdout_initial..main} | 2 +-\n ...diff.format-patch_--stdout_initial..main^} | 2 +-\n t/t4013/diff.log_--decorate=full_--all | 2 +-\n t/t4013/diff.log_--decorate_--all | 2 +-\n ..._--diff-merges=off_-p_--first-parent_main} | 2 +-\n ..._--first-parent_--diff-merges=off_-p_main} | 2 +-\n ...g_--no-diff-merges_-p_--first-parent_main} | 2 +-\n ..._--patch-with-stat_--summary_main_--_dir_} | 2 +-\n ...master => diff.log_--patch-with-stat_main} | 2 +-\n ...> diff.log_--patch-with-stat_main_--_dir_} | 2 +-\n ...oot_--cc_--patch-with-stat_--summary_main} | 2 +-\n ...g_--root_--patch-with-stat_--summary_main} | 2 +-\n ...=> diff.log_--root_--patch-with-stat_main} | 2 +-\n ...-root_-c_--patch-with-stat_--summary_main} | 2 +-\n ...root_-p_master => diff.log_--root_-p_main} | 2 +-\n ...log_--root_master => diff.log_--root_main} | 2 +-\n ...ter => diff.log_-GF_-p_--pickaxe-all_main} | 2 +-\n ...log_-GF_-p_master => diff.log_-GF_-p_main} | 2 +-\n ...{diff.log_-SF_master => diff.log_-GF_main} | 2 +-\n ...log_-SF_-p_master => diff.log_-SF_-p_main} | 2 +-\n ...{diff.log_-GF_master => diff.log_-SF_main} | 2 +-\n t/t4013/diff.log_-SF_main_--max-count=0 | 2 +\n ...ount=2 => diff.log_-SF_main_--max-count=1} | 2 +-\n t/t4013/diff.log_-SF_main_--max-count=2 | 7 +\n t/t4013/diff.log_-SF_master_--max-count=0 | 2 -\n t/t4013/diff.log_-SF_master_--max-count=1 | 7 -\n ...iff.log_-S_F_master => diff.log_-S_F_main} | 2 +-\n ...ter => diff.log_-m_-p_--first-parent_main} | 2 +-\n ...f.log_-m_-p_master => diff.log_-m_-p_main} | 2 +-\n ...master => diff.log_-p_--first-parent_main} | 2 +-\n .../{diff.log_-p_master => diff.log_-p_main} | 2 +-\n t/t4013/{diff.log_master => diff.log_main} | 2 +-\n ...iff.noellipses-diff-tree_-c_--abbrev_main} | 2 +-\n ...> diff.noellipses-whatchanged_--root_main} | 2 +-\n ...r => diff.noellipses-whatchanged_-SF_main} | 2 +-\n ...aster => diff.noellipses-whatchanged_main} | 2 +-\n ...t_master => diff.show_--first-parent_main} | 2 +-\n ...{diff.show_-c_master => diff.show_-c_main} | 2 +-\n ...{diff.show_-m_master => diff.show_-m_main} | 2 +-\n t/t4013/{diff.show_master => diff.show_main} | 2 +-\n ..._--patch-with-stat_--summary_main_--_dir_} | 2 +-\n ...> diff.whatchanged_--patch-with-stat_main} | 2 +-\n ...hatchanged_--patch-with-stat_main_--_dir_} | 2 +-\n ...oot_--cc_--patch-with-stat_--summary_main} | 2 +-\n ...d_--root_--patch-with-stat_--summary_main} | 2 +-\n ...whatchanged_--root_--patch-with-stat_main} | 2 +-\n ...-root_-c_--patch-with-stat_--summary_main} | 2 +-\n ...master => diff.whatchanged_--root_-p_main} | 2 +-\n ...ot_master => diff.whatchanged_--root_main} | 2 +-\n ...-p_master => diff.whatchanged_-SF_-p_main} | 2 +-\n ...d_-SF_master => diff.whatchanged_-SF_main} | 2 +-\n ...ged_-p_master => diff.whatchanged_-p_main} | 2 +-\n ...atchanged_master => diff.whatchanged_main} | 2 +-\n 85 files changed, 181 insertions(+), 178 deletions(-)\n rename t/t4013/{diff.diff-tree_--cc_--patch-with-stat_--summary_master => diff.diff-tree_--cc_--patch-with-stat_--summary_main} (86%)\n rename t/t4013/{diff.diff-tree_--cc_--patch-with-stat_master => diff.diff-tree_--cc_--patch-with-stat_main} (89%)\n rename t/t4013/{diff.diff-tree_--cc_--shortstat_master => diff.diff-tree_--cc_--shortstat_main} (65%)\n rename t/t4013/{diff.diff-tree_-c_--stat_--summary_master => diff.diff-tree_--cc_--stat_--summary_main} (71%)\n rename t/t4013/{diff.diff-tree_-c_--stat_master => diff.diff-tree_--cc_--stat_main} (76%)\n rename t/t4013/{diff.diff-tree_--cc_master => diff.diff-tree_--cc_main} (91%)\n rename t/t4013/{diff.diff-tree_-c_--abbrev_master => diff.diff-tree_-c_--abbrev_main} (83%)\n rename t/t4013/{diff.diff-tree_--cc_--stat_--summary_master => diff.diff-tree_-c_--stat_--summary_main} (70%)\n rename t/t4013/{diff.diff-tree_--cc_--stat_master => diff.diff-tree_-c_--stat_main} (75%)\n rename t/t4013/{diff.diff-tree_-c_master => diff.diff-tree_-c_main} (93%)\n rename t/t4013/{diff.diff-tree_-p_-m_master => diff.diff-tree_-p_-m_main} (97%)\n create mode 100644 t/t4013/diff.diff-tree_-p_main\n delete mode 100644 t/t4013/diff.diff-tree_-p_master\n create mode 100644 t/t4013/diff.diff-tree_main\n delete mode 100644 t/t4013/diff.diff-tree_master\n create mode 100644 t/t4013/diff.diff_--dirstat_--cc_main~1_main\n delete mode 100644 t/t4013/diff.diff_--dirstat_--cc_master~1_master\n create mode 100644 t/t4013/diff.diff_--dirstat_main~1_main~2\n delete mode 100644 t/t4013/diff.diff_--dirstat_master~1_master~2\n rename t/t4013/{diff.diff_--line-prefix=abc_master_master^_side => diff.diff_--line-prefix=abc_main_main^_side} (87%)\n rename t/t4013/{diff.diff_master_master^_side => diff.diff_main_main^_side} (89%)\n rename t/t4013/{diff.format-patch_--attach_--stdout_initial..master => diff.format-patch_--attach_--stdout_initial..main} (98%)\n rename t/t4013/{diff.format-patch_--attach_--stdout_initial..master^ => diff.format-patch_--attach_--stdout_initial..main^} (97%)\n rename t/t4013/{diff.format-patch_--inline_--stdout_--numbered-files_initial..master => diff.format-patch_--inline_--stdout_--numbered-files_initial..main} (99%)\n rename t/t4013/{diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master => diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..main} (99%)\n rename t/t4013/{diff.format-patch_--inline_--stdout_initial..master => diff.format-patch_--inline_--stdout_initial..main} (98%)\n rename t/t4013/{diff.format-patch_--inline_--stdout_initial..master^ => diff.format-patch_--inline_--stdout_initial..main^} (97%)\n rename t/t4013/{diff.format-patch_--inline_--stdout_initial..master^^ => diff.format-patch_--inline_--stdout_initial..main^^} (95%)\n rename t/t4013/{diff.format-patch_--stdout_--cover-letter_-n_initial..master^ => diff.format-patch_--stdout_--cover-letter_-n_initial..main^} (96%)\n rename t/t4013/{diff.format-patch_--stdout_--no-numbered_initial..master => diff.format-patch_--stdout_--no-numbered_initial..main} (97%)\n rename t/t4013/{diff.format-patch_--stdout_--numbered_initial..master => diff.format-patch_--stdout_--numbered_initial..main} (97%)\n rename t/t4013/{diff.format-patch_--stdout_initial..master => diff.format-patch_--stdout_initial..main} (97%)\n rename t/t4013/{diff.format-patch_--stdout_initial..master^ => diff.format-patch_--stdout_initial..main^} (96%)\n rename t/t4013/{diff.log_--no-diff-merges_-p_--first-parent_master => diff.log_--diff-merges=off_-p_--first-parent_main} (95%)\n rename t/t4013/{diff.log_--first-parent_--diff-merges=off_-p_master => diff.log_--first-parent_--diff-merges=off_-p_main} (95%)\n rename t/t4013/{diff.log_--diff-merges=off_-p_--first-parent_master => diff.log_--no-diff-merges_-p_--first-parent_main} (95%)\n rename t/t4013/{diff.log_--patch-with-stat_--summary_master_--_dir_ => diff.log_--patch-with-stat_--summary_main_--_dir_} (96%)\n rename t/t4013/{diff.log_--patch-with-stat_master => diff.log_--patch-with-stat_main} (98%)\n rename t/t4013/{diff.log_--patch-with-stat_master_--_dir_ => diff.log_--patch-with-stat_main_--_dir_} (96%)\n rename t/t4013/{diff.log_--root_--cc_--patch-with-stat_--summary_master => diff.log_--root_--cc_--patch-with-stat_--summary_main} (98%)\n rename t/t4013/{diff.log_--root_--patch-with-stat_--summary_master => diff.log_--root_--patch-with-stat_--summary_main} (98%)\n rename t/t4013/{diff.log_--root_--patch-with-stat_master => diff.log_--root_--patch-with-stat_main} (98%)\n rename t/t4013/{diff.log_--root_-c_--patch-with-stat_--summary_master => diff.log_--root_-c_--patch-with-stat_--summary_main} (98%)\n rename t/t4013/{diff.log_--root_-p_master => diff.log_--root_-p_main} (98%)\n rename t/t4013/{diff.log_--root_master => diff.log_--root_main} (96%)\n rename t/t4013/{diff.log_-GF_-p_--pickaxe-all_master => diff.log_-GF_-p_--pickaxe-all_main} (90%)\n rename t/t4013/{diff.log_-GF_-p_master => diff.log_-GF_-p_main} (91%)\n rename t/t4013/{diff.log_-SF_master => diff.log_-GF_main} (86%)\n rename t/t4013/{diff.log_-SF_-p_master => diff.log_-SF_-p_main} (91%)\n rename t/t4013/{diff.log_-GF_master => diff.log_-SF_main} (86%)\n create mode 100644 t/t4013/diff.log_-SF_main_--max-count=0\n rename t/t4013/{diff.log_-SF_master_--max-count=2 => diff.log_-SF_main_--max-count=1} (79%)\n create mode 100644 t/t4013/diff.log_-SF_main_--max-count=2\n delete mode 100644 t/t4013/diff.log_-SF_master_--max-count=0\n delete mode 100644 t/t4013/diff.log_-SF_master_--max-count=1\n rename t/t4013/{diff.log_-S_F_master => diff.log_-S_F_main} (86%)\n rename t/t4013/{diff.log_-m_-p_--first-parent_master => diff.log_-m_-p_--first-parent_main} (97%)\n rename t/t4013/{diff.log_-m_-p_master => diff.log_-m_-p_main} (99%)\n rename t/t4013/{diff.log_-p_--first-parent_master => diff.log_-p_--first-parent_main} (97%)\n rename t/t4013/{diff.log_-p_master => diff.log_-p_main} (98%)\n rename t/t4013/{diff.log_master => diff.log_main} (97%)\n rename t/t4013/{diff.noellipses-diff-tree_-c_--abbrev_master => diff.noellipses-diff-tree_-c_--abbrev_main} (81%)\n rename t/t4013/{diff.noellipses-whatchanged_--root_master => diff.noellipses-whatchanged_--root_main} (96%)\n rename t/t4013/{diff.noellipses-whatchanged_-SF_master => diff.noellipses-whatchanged_-SF_main} (86%)\n rename t/t4013/{diff.noellipses-whatchanged_master => diff.noellipses-whatchanged_main} (96%)\n rename t/t4013/{diff.show_--first-parent_master => diff.show_--first-parent_main} (92%)\n rename t/t4013/{diff.show_-c_master => diff.show_-c_main} (95%)\n rename t/t4013/{diff.show_-m_master => diff.show_-m_main} (98%)\n rename t/t4013/{diff.show_master => diff.show_main} (96%)\n rename t/t4013/{diff.whatchanged_--patch-with-stat_--summary_master_--_dir_ => diff.whatchanged_--patch-with-stat_--summary_main_--_dir_} (94%)\n rename t/t4013/{diff.whatchanged_--patch-with-stat_master => diff.whatchanged_--patch-with-stat_main} (97%)\n rename t/t4013/{diff.whatchanged_--patch-with-stat_master_--_dir_ => diff.whatchanged_--patch-with-stat_main_--_dir_} (94%)\n rename t/t4013/{diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master => diff.whatchanged_--root_--cc_--patch-with-stat_--summary_main} (97%)\n rename t/t4013/{diff.whatchanged_--root_--patch-with-stat_--summary_master => diff.whatchanged_--root_--patch-with-stat_--summary_main} (97%)\n rename t/t4013/{diff.whatchanged_--root_--patch-with-stat_master => diff.whatchanged_--root_--patch-with-stat_main} (97%)\n rename t/t4013/{diff.whatchanged_--root_-c_--patch-with-stat_--summary_master => diff.whatchanged_--root_-c_--patch-with-stat_--summary_main} (97%)\n rename t/t4013/{diff.whatchanged_--root_-p_master => diff.whatchanged_--root_-p_main} (98%)\n rename t/t4013/{diff.whatchanged_--root_master => diff.whatchanged_--root_main} (97%)\n rename t/t4013/{diff.whatchanged_-SF_-p_master => diff.whatchanged_-SF_-p_main} (89%)\n rename t/t4013/{diff.whatchanged_-SF_master => diff.whatchanged_-SF_main} (86%)\n rename t/t4013/{diff.whatchanged_-p_master => diff.whatchanged_-p_main} (98%)\n rename t/t4013/{diff.whatchanged_master => diff.whatchanged_main} (97%)\n\ndiff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh\nindex 5c7b0122b4..1d0ce8de25 100755\n--- a/t/t4013-diff-various.sh\n+++ b/t/t4013-diff-various.sh\n@@ -5,6 +5,9 @@\n \n test_description='Various diff formatting options'\n \n+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main\n+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n+\n . ./test-lib.sh\n \n test_expect_success setup '\n@@ -60,7 +63,7 @@ test_expect_success setup '\n \tGIT_COMMITTER_DATE=\"2006-06-26 00:04:00 +0000\" &&\n \texport GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&\n \n-\tgit checkout master &&\n+\tgit checkout main &&\n \tgit pull -s ours . side &&\n \n \tGIT_AUTHOR_DATE=\"2006-06-26 00:05:00 +0000\" &&\n@@ -85,7 +88,7 @@ test_expect_success setup '\n \tfor i in B A; do echo $i; done >dir/sub &&\n \tgit add dir/sub &&\n \tgit commit -m \"Rearranged lines in dir/sub\" &&\n-\tgit checkout master &&\n+\tgit checkout main &&\n \n \tGIT_AUTHOR_DATE=\"2006-06-26 00:06:00 +0000\" &&\n \tGIT_COMMITTER_DATE=\"2006-06-26 00:06:00 +0000\" &&\n@@ -93,7 +96,7 @@ test_expect_success setup '\n \tgit checkout -b mode initial &&\n \tgit update-index --chmod=+x file0 &&\n \tgit commit -m \"update mode\" &&\n-\tgit checkout -f master &&\n+\tgit checkout -f main &&\n \n \tGIT_AUTHOR_DATE=\"2006-06-26 00:06:00 +0000\" &&\n \tGIT_COMMITTER_DATE=\"2006-06-26 00:06:00 +0000\" &&\n@@ -102,12 +105,12 @@ test_expect_success setup '\n \tgit update-index --chmod=+x file2 &&\n \tgit commit -m \"update mode (file2)\" &&\n \tgit notes add -m \"note\" &&\n-\tgit checkout -f master &&\n+\tgit checkout -f main &&\n \n-\t# Same merge as master, but with parents reversed. Hide it in a\n+\t# Same merge as main, but with parents reversed. Hide it in a\n \t# pseudo-ref to avoid impacting tests with --all.\n \tcommit=$(echo reverse |\n-\t\t git commit-tree -p master^2 -p master^1 master^{tree}) &&\n+\t\t git commit-tree -p main^2 -p main^1 main^{tree}) &&\n \tgit update-ref REVERSE $commit &&\n \n \tgit config diff.renames false &&\n@@ -117,15 +120,15 @@ test_expect_success setup '\n \n : <<\\EOF\n ! [initial] Initial\n- * [master] Merge branch 'side'\n+ * [main] Merge branch 'side'\n ! [rearrange] Rearranged lines in dir/sub\n ! [side] Side\n ----\n + [rearrange] Rearranged lines in dir/sub\n- - [master] Merge branch 'side'\n+ - [main] Merge branch 'side'\n * + [side] Side\n- * [master^] Third\n- * [master~2] Second\n+ * [main^] Third\n+ * [main~2] Second\n +*++ [initial] Initial\n EOF\n \n@@ -283,91 +286,91 @@ diff-tree initial mode\n diff-tree --stat initial mode\n diff-tree --summary initial mode\n \n-diff-tree master\n-diff-tree -p master\n-diff-tree -p -m master\n-diff-tree -c master\n-diff-tree -c --abbrev master\n-:noellipses diff-tree -c --abbrev master\n-diff-tree --cc master\n+diff-tree main\n+diff-tree -p main\n+diff-tree -p -m main\n+diff-tree -c main\n+diff-tree -c --abbrev main\n+:noellipses diff-tree -c --abbrev main\n+diff-tree --cc main\n # stat only should show the diffstat with the first parent\n-diff-tree -c --stat master\n-diff-tree --cc --stat master\n-diff-tree -c --stat --summary master\n-diff-tree --cc --stat --summary master\n+diff-tree -c --stat main\n+diff-tree --cc --stat main\n+diff-tree -c --stat --summary main\n+diff-tree --cc --stat --summary main\n # stat summary should show the diffstat and summary with the first parent\n diff-tree -c --stat --summary side\n diff-tree --cc --stat --summary side\n-diff-tree --cc --shortstat master\n+diff-tree --cc --shortstat main\n diff-tree --cc --summary REVERSE\n # improved by Timo's patch\n-diff-tree --cc --patch-with-stat master\n+diff-tree --cc --patch-with-stat main\n # improved by Timo's patch\n-diff-tree --cc --patch-with-stat --summary master\n+diff-tree --cc --patch-with-stat --summary main\n # this is correct\n diff-tree --cc --patch-with-stat --summary side\n \n-log master\n-log -p master\n-log --root master\n-log --root -p master\n-log --patch-with-stat master\n-log --root --patch-with-stat master\n-log --root --patch-with-stat --summary master\n+log main\n+log -p main\n+log --root main\n+log --root -p main\n+log --patch-with-stat main\n+log --root --patch-with-stat main\n+log --root --patch-with-stat --summary main\n # improved by Timo's patch\n-log --root -c --patch-with-stat --summary master\n+log --root -c --patch-with-stat --summary main\n # improved by Timo's patch\n-log --root --cc --patch-with-stat --summary master\n-log --no-diff-merges -p --first-parent master\n-log --diff-merges=off -p --first-parent master\n-log --first-parent --diff-merges=off -p master\n-log -p --first-parent master\n-log -m -p --first-parent master\n-log -m -p master\n-log -SF master\n-log -S F master\n-log -SF -p master\n-log -SF master --max-count=0\n-log -SF master --max-count=1\n-log -SF master --max-count=2\n-log -GF master\n-log -GF -p master\n-log -GF -p --pickaxe-all master\n+log --root --cc --patch-with-stat --summary main\n+log --no-diff-merges -p --first-parent main\n+log --diff-merges=off -p --first-parent main\n+log --first-parent --diff-merges=off -p main\n+log -p --first-parent main\n+log -m -p --first-parent main\n+log -m -p main\n+log -SF main\n+log -S F main\n+log -SF -p main\n+log -SF main --max-count=0\n+log -SF main --max-count=1\n+log -SF main --max-count=2\n+log -GF main\n+log -GF -p main\n+log -GF -p --pickaxe-all main\n log --decorate --all\n log --decorate=full --all\n \n rev-list --parents HEAD\n rev-list --children HEAD\n \n-whatchanged master\n-:noellipses whatchanged master\n-whatchanged -p master\n-whatchanged --root master\n-:noellipses whatchanged --root master\n-whatchanged --root -p master\n-whatchanged --patch-with-stat master\n-whatchanged --root --patch-with-stat master\n-whatchanged --root --patch-with-stat --summary master\n+whatchanged main\n+:noellipses whatchanged main\n+whatchanged -p main\n+whatchanged --root main\n+:noellipses whatchanged --root main\n+whatchanged --root -p main\n+whatchanged --patch-with-stat main\n+whatchanged --root --patch-with-stat main\n+whatchanged --root --patch-with-stat --summary main\n # improved by Timo's patch\n-whatchanged --root -c --patch-with-stat --summary master\n+whatchanged --root -c --patch-with-stat --summary main\n # improved by Timo's patch\n-whatchanged --root --cc --patch-with-stat --summary master\n-whatchanged -SF master\n-:noellipses whatchanged -SF master\n-whatchanged -SF -p master\n+whatchanged --root --cc --patch-with-stat --summary main\n+whatchanged -SF main\n+:noellipses whatchanged -SF main\n+whatchanged -SF -p main\n \n-log --patch-with-stat master -- dir/\n-whatchanged --patch-with-stat master -- dir/\n-log --patch-with-stat --summary master -- dir/\n-whatchanged --patch-with-stat --summary master -- dir/\n+log --patch-with-stat main -- dir/\n+whatchanged --patch-with-stat main -- dir/\n+log --patch-with-stat --summary main -- dir/\n+whatchanged --patch-with-stat --summary main -- dir/\n \n show initial\n show --root initial\n show side\n-show master\n-show -c master\n-show -m master\n-show --first-parent master\n+show main\n+show -c main\n+show -m main\n+show --first-parent main\n show --stat side\n show --stat --summary side\n show --patch-with-stat side\n@@ -376,22 +379,22 @@ show --patch-with-raw side\n show --patch-with-stat --summary side\n \n format-patch --stdout initial..side\n-format-patch --stdout initial..master^\n-format-patch --stdout initial..master\n-format-patch --stdout --no-numbered initial..master\n-format-patch --stdout --numbered initial..master\n+format-patch --stdout initial..main^\n+format-patch --stdout initial..main\n+format-patch --stdout --no-numbered initial..main\n+format-patch --stdout --numbered initial..main\n format-patch --attach --stdout initial..side\n format-patch --attach --stdout --suffix=.diff initial..side\n-format-patch --attach --stdout initial..master^\n-format-patch --attach --stdout initial..master\n+format-patch --attach --stdout initial..main^\n+format-patch --attach --stdout initial..main\n format-patch --inline --stdout initial..side\n-format-patch --inline --stdout initial..master^\n-format-patch --inline --stdout --numbered-files initial..master\n-format-patch --inline --stdout initial..master\n-format-patch --inline --stdout --subject-prefix=TESTCASE initial..master\n+format-patch --inline --stdout initial..main^\n+format-patch --inline --stdout --numbered-files initial..main\n+format-patch --inline --stdout initial..main\n+format-patch --inline --stdout --subject-prefix=TESTCASE initial..main\n config format.subjectprefix DIFFERENT_PREFIX\n-format-patch --inline --stdout initial..master^^\n-format-patch --stdout --cover-letter -n initial..master^\n+format-patch --inline --stdout initial..main^^\n+format-patch --stdout --cover-letter -n initial..main^\n \n diff --abbrev initial..side\n diff -U initial..side\n@@ -410,13 +413,13 @@ diff --name-status dir2 dir\n diff --no-index --name-status dir2 dir\n diff --no-index --name-status -- dir2 dir\n diff --no-index dir dir3\n-diff master master^ side\n+diff main main^ side\n # Can't use spaces...\n-diff --line-prefix=abc master master^ side\n-diff --dirstat master~1 master~2\n+diff --line-prefix=abc main main^ side\n+diff --dirstat main~1 main~2\n diff --dirstat initial rearrange\n diff --dirstat-by-file initial rearrange\n-diff --dirstat --cc master~1 master\n+diff --dirstat --cc main~1 main\n # No-index --abbrev and --no-abbrev\n diff --raw initial\n :noellipses diff --raw initial\n@@ -469,7 +472,7 @@ test_expect_success 'diff-tree --stdin with log formatting' '\n \tThird\n \tSecond\n \tEOF\n-\tgit rev-list master | git diff-tree --stdin --format=%s -s >actual &&\n+\tgit rev-list main | git diff-tree --stdin --format=%s -s >actual &&\n \ttest_cmp expect actual\n '\n \ndiff --git a/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master b/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_main\nsimilarity index 86%\nrename from t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master\nrename to t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_main\nindex 9951e3677d..af1cf20f4c 100644\n--- a/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master\n+++ b/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_main\n@@ -1,4 +1,4 @@\n-$ git diff-tree --cc --patch-with-stat --summary master\n+$ git diff-tree --cc --patch-with-stat --summary main\n 59d314ad6f356dd08601a4cd5e530381da3e3c64\n dir/sub | 2 ++\n file0 | 3 +++\ndiff --git a/t/t4013/diff.diff-tree_--cc_--patch-with-stat_master b/t/t4013/diff.diff-tree_--cc_--patch-with-stat_main\nsimilarity index 89%\nrename from t/t4013/diff.diff-tree_--cc_--patch-with-stat_master\nrename to t/t4013/diff.diff-tree_--cc_--patch-with-stat_main\nindex db3c0a7b2c..0ec6042097 100644\n--- a/t/t4013/diff.diff-tree_--cc_--patch-with-stat_master\n+++ b/t/t4013/diff.diff-tree_--cc_--patch-with-stat_main\n@@ -1,4 +1,4 @@\n-$ git diff-tree --cc --patch-with-stat master\n+$ git diff-tree --cc --patch-with-stat main\n 59d314ad6f356dd08601a4cd5e530381da3e3c64\n dir/sub | 2 ++\n file0 | 3 +++\ndiff --git a/t/t4013/diff.diff-tree_--cc_--shortstat_master b/t/t4013/diff.diff-tree_--cc_--shortstat_main\nsimilarity index 65%\nrename from t/t4013/diff.diff-tree_--cc_--shortstat_master\nrename to t/t4013/diff.diff-tree_--cc_--shortstat_main\nindex a4ca42df2a..9a4ef03197 100644\n--- a/t/t4013/diff.diff-tree_--cc_--shortstat_master\n+++ b/t/t4013/diff.diff-tree_--cc_--shortstat_main\n@@ -1,4 +1,4 @@\n-$ git diff-tree --cc --shortstat master\n+$ git diff-tree --cc --shortstat main\n 59d314ad6f356dd08601a4cd5e530381da3e3c64\n 2 files changed, 5 insertions(+)\n $\ndiff --git a/t/t4013/diff.diff-tree_-c_--stat_--summary_master b/t/t4013/diff.diff-tree_--cc_--stat_--summary_main\nsimilarity index 71%\nrename from t/t4013/diff.diff-tree_-c_--stat_--summary_master\nrename to t/t4013/diff.diff-tree_--cc_--stat_--summary_main\nindex 81c3021541..9db08a4aa9 100644\n--- a/t/t4013/diff.diff-tree_-c_--stat_--summary_master\n+++ b/t/t4013/diff.diff-tree_--cc_--stat_--summary_main\n@@ -1,4 +1,4 @@\n-$ git diff-tree -c --stat --summary master\n+$ git diff-tree --cc --stat --summary main\n 59d314ad6f356dd08601a4cd5e530381da3e3c64\n dir/sub | 2 ++\n file0 | 3 +++\ndiff --git a/t/t4013/diff.diff-tree_-c_--stat_master b/t/t4013/diff.diff-tree_--cc_--stat_main\nsimilarity index 76%\nrename from t/t4013/diff.diff-tree_-c_--stat_master\nrename to t/t4013/diff.diff-tree_--cc_--stat_main\nindex 89d59b1548..7ecc67a524 100644\n--- a/t/t4013/diff.diff-tree_-c_--stat_master\n+++ b/t/t4013/diff.diff-tree_--cc_--stat_main\n@@ -1,4 +1,4 @@\n-$ git diff-tree -c --stat master\n+$ git diff-tree --cc --stat main\n 59d314ad6f356dd08601a4cd5e530381da3e3c64\n dir/sub | 2 ++\n file0 | 3 +++\ndiff --git a/t/t4013/diff.diff-tree_--cc_master b/t/t4013/diff.diff-tree_--cc_main\nsimilarity index 91%\nrename from t/t4013/diff.diff-tree_--cc_master\nrename to t/t4013/diff.diff-tree_--cc_main\nindex 5ecb4e14ae..1a962856ad 100644\n--- a/t/t4013/diff.diff-tree_--cc_master\n+++ b/t/t4013/diff.diff-tree_--cc_main\n@@ -1,4 +1,4 @@\n-$ git diff-tree --cc master\n+$ git diff-tree --cc main\n 59d314ad6f356dd08601a4cd5e530381da3e3c64\n diff --cc dir/sub\n index cead32e,7289e35..992913c\ndiff --git a/t/t4013/diff.diff-tree_-c_--abbrev_master b/t/t4013/diff.diff-tree_-c_--abbrev_main\nsimilarity index 83%\nrename from t/t4013/diff.diff-tree_-c_--abbrev_master\nrename to t/t4013/diff.diff-tree_-c_--abbrev_main\nindex b8e4aa2530..039d127cf2 100644\n--- a/t/t4013/diff.diff-tree_-c_--abbrev_master\n+++ b/t/t4013/diff.diff-tree_-c_--abbrev_main\n@@ -1,4 +1,4 @@\n-$ git diff-tree -c --abbrev master\n+$ git diff-tree -c --abbrev main\n 59d314ad6f356dd08601a4cd5e530381da3e3c64\n ::100644 100644 100644 cead32e... 7289e35... 992913c... MM\tdir/sub\n ::100644 100644 100644 b414108... f4615da... 10a8a9f... MM\tfile0\ndiff --git a/t/t4013/diff.diff-tree_--cc_--stat_--summary_master b/t/t4013/diff.diff-tree_-c_--stat_--summary_main\nsimilarity index 70%\nrename from t/t4013/diff.diff-tree_--cc_--stat_--summary_master\nrename to t/t4013/diff.diff-tree_-c_--stat_--summary_main\nindex d019867dd9..05a8d16ba7 100644\n--- a/t/t4013/diff.diff-tree_--cc_--stat_--summary_master\n+++ b/t/t4013/diff.diff-tree_-c_--stat_--summary_main\n@@ -1,4 +1,4 @@\n-$ git diff-tree --cc --stat --summary master\n+$ git diff-tree -c --stat --summary main\n 59d314ad6f356dd08601a4cd5e530381da3e3c64\n dir/sub | 2 ++\n file0 | 3 +++\ndiff --git a/t/t4013/diff.diff-tree_--cc_--stat_master b/t/t4013/diff.diff-tree_-c_--stat_main\nsimilarity index 75%\nrename from t/t4013/diff.diff-tree_--cc_--stat_master\nrename to t/t4013/diff.diff-tree_-c_--stat_main\nindex 40b91796b3..61d9f450df 100644\n--- a/t/t4013/diff.diff-tree_--cc_--stat_master\n+++ b/t/t4013/diff.diff-tree_-c_--stat_main\n@@ -1,4 +1,4 @@\n-$ git diff-tree --cc --stat master\n+$ git diff-tree -c --stat main\n 59d314ad6f356dd08601a4cd5e530381da3e3c64\n dir/sub | 2 ++\n file0 | 3 +++\ndiff --git a/t/t4013/diff.diff-tree_-c_master b/t/t4013/diff.diff-tree_-c_main\nsimilarity index 93%\nrename from t/t4013/diff.diff-tree_-c_master\nrename to t/t4013/diff.diff-tree_-c_main\nindex e2d2bb2611..a84e1185cf 100644\n--- a/t/t4013/diff.diff-tree_-c_master\n+++ b/t/t4013/diff.diff-tree_-c_main\n@@ -1,4 +1,4 @@\n-$ git diff-tree -c master\n+$ git diff-tree -c main\n 59d314ad6f356dd08601a4cd5e530381da3e3c64\n ::100644 100644 100644 cead32e925b1420c84c14cbf7cf755e7e45af8ad 7289e35bff32727c08dda207511bec138fdb9ea5 992913c5aa0a5476d10c49ed0f21fc0c6d1aedf3 MM\tdir/sub\n ::100644 100644 100644 b414108e81e5091fe0974a1858b4d0d22b107f70 f4615da674c09df322d6ba8d6b21ecfb1b1ba510 10a8a9f3657f91a156b9f0184ed79a20adef9f7f MM\tfile0\ndiff --git a/t/t4013/diff.diff-tree_-p_-m_master b/t/t4013/diff.diff-tree_-p_-m_main\nsimilarity index 97%\nrename from t/t4013/diff.diff-tree_-p_-m_master\nrename to t/t4013/diff.diff-tree_-p_-m_main\nindex b60bea039d..29c9fc20b8 100644\n--- a/t/t4013/diff.diff-tree_-p_-m_master\n+++ b/t/t4013/diff.diff-tree_-p_-m_main\n@@ -1,4 +1,4 @@\n-$ git diff-tree -p -m master\n+$ git diff-tree -p -m main\n 59d314ad6f356dd08601a4cd5e530381da3e3c64\n diff --git a/dir/sub b/dir/sub\n index cead32e..992913c 100644\ndiff --git a/t/t4013/diff.diff-tree_-p_main b/t/t4013/diff.diff-tree_-p_main\nnew file mode 100644\nindex 0000000000..c658062422\n--- /dev/null\n+++ b/t/t4013/diff.diff-tree_-p_main\n@@ -0,0 +1,2 @@\n+$ git diff-tree -p main\n+$\ndiff --git a/t/t4013/diff.diff-tree_-p_master b/t/t4013/diff.diff-tree_-p_master\ndeleted file mode 100644\nindex b182875fb2..0000000000\n--- a/t/t4013/diff.diff-tree_-p_master\n+++ /dev/null\n@@ -1,2 +0,0 @@\n-$ git diff-tree -p master\n-$\ndiff --git a/t/t4013/diff.diff-tree_main b/t/t4013/diff.diff-tree_main\nnew file mode 100644\nindex 0000000000..dc5b9fdeb6\n--- /dev/null\n+++ b/t/t4013/diff.diff-tree_main\n@@ -0,0 +1,2 @@\n+$ git diff-tree main\n+$\ndiff --git a/t/t4013/diff.diff-tree_master b/t/t4013/diff.diff-tree_master\ndeleted file mode 100644\nindex fe9226f8a1..0000000000\n--- a/t/t4013/diff.diff-tree_master\n+++ /dev/null\n@@ -1,2 +0,0 @@\n-$ git diff-tree master\n-$\ndiff --git a/t/t4013/diff.diff_--dirstat_--cc_main~1_main b/t/t4013/diff.diff_--dirstat_--cc_main~1_main\nnew file mode 100644\nindex 0000000000..168a357a02\n--- /dev/null\n+++ b/t/t4013/diff.diff_--dirstat_--cc_main~1_main\n@@ -0,0 +1,3 @@\n+$ git diff --dirstat --cc main~1 main\n+ 40.0% dir/\n+$\ndiff --git a/t/t4013/diff.diff_--dirstat_--cc_master~1_master b/t/t4013/diff.diff_--dirstat_--cc_master~1_master\ndeleted file mode 100644\nindex fba4e34175..0000000000\n--- a/t/t4013/diff.diff_--dirstat_--cc_master~1_master\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-$ git diff --dirstat --cc master~1 master\n- 40.0% dir/\n-$\ndiff --git a/t/t4013/diff.diff_--dirstat_main~1_main~2 b/t/t4013/diff.diff_--dirstat_main~1_main~2\nnew file mode 100644\nindex 0000000000..6809733708\n--- /dev/null\n+++ b/t/t4013/diff.diff_--dirstat_main~1_main~2\n@@ -0,0 +1,3 @@\n+$ git diff --dirstat main~1 main~2\n+ 40.0% dir/\n+$\ndiff --git a/t/t4013/diff.diff_--dirstat_master~1_master~2 b/t/t4013/diff.diff_--dirstat_master~1_master~2\ndeleted file mode 100644\nindex b672e1ca63..0000000000\n--- a/t/t4013/diff.diff_--dirstat_master~1_master~2\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-$ git diff --dirstat master~1 master~2\n- 40.0% dir/\n-$\ndiff --git a/t/t4013/diff.diff_--line-prefix=abc_master_master^_side b/t/t4013/diff.diff_--line-prefix=abc_main_main^_side\nsimilarity index 87%\nrename from t/t4013/diff.diff_--line-prefix=abc_master_master^_side\nrename to t/t4013/diff.diff_--line-prefix=abc_main_main^_side\nindex 99f91e7f0e..67a2145a36 100644\n--- a/t/t4013/diff.diff_--line-prefix=abc_master_master^_side\n+++ b/t/t4013/diff.diff_--line-prefix=abc_main_main^_side\n@@ -1,4 +1,4 @@\n-$ git diff --line-prefix=abc master master^ side\n+$ git diff --line-prefix=abc main main^ side\n abcdiff --cc dir/sub\n abcindex cead32e,7289e35..992913c\n abc--- a/dir/sub\ndiff --git a/t/t4013/diff.diff_master_master^_side b/t/t4013/diff.diff_main_main^_side\nsimilarity index 89%\nrename from t/t4013/diff.diff_master_master^_side\nrename to t/t4013/diff.diff_main_main^_side\nindex 50ec9cadd6..ab81ec9e47 100644\n--- a/t/t4013/diff.diff_master_master^_side\n+++ b/t/t4013/diff.diff_main_main^_side\n@@ -1,4 +1,4 @@\n-$ git diff master master^ side\n+$ git diff main main^ side\n diff --cc dir/sub\n index cead32e,7289e35..992913c\n --- a/dir/sub\ndiff --git a/t/t4013/diff.format-patch_--attach_--stdout_initial..master b/t/t4013/diff.format-patch_--attach_--stdout_initial..main\nsimilarity index 98%\nrename from t/t4013/diff.format-patch_--attach_--stdout_initial..master\nrename to t/t4013/diff.format-patch_--attach_--stdout_initial..main\nindex 52fedc179e..9f56380350 100644\n--- a/t/t4013/diff.format-patch_--attach_--stdout_initial..master\n+++ b/t/t4013/diff.format-patch_--attach_--stdout_initial..main\n@@ -1,4 +1,4 @@\n-$ git format-patch --attach --stdout initial..master\n+$ git format-patch --attach --stdout initial..main\n From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001\n From: A U Thor \n Date: Mon, 26 Jun 2006 00:01:00 +0000\ndiff --git a/t/t4013/diff.format-patch_--attach_--stdout_initial..master^ b/t/t4013/diff.format-patch_--attach_--stdout_initial..main^\nsimilarity index 97%\nrename from t/t4013/diff.format-patch_--attach_--stdout_initial..master^\nrename to t/t4013/diff.format-patch_--attach_--stdout_initial..main^\nindex 1c3cde251b..80132ea99e 100644\n--- a/t/t4013/diff.format-patch_--attach_--stdout_initial..master^\n+++ b/t/t4013/diff.format-patch_--attach_--stdout_initial..main^\n@@ -1,4 +1,4 @@\n-$ git format-patch --attach --stdout initial..master^\n+$ git format-patch --attach --stdout initial..main^\n From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001\n From: A U Thor \n Date: Mon, 26 Jun 2006 00:01:00 +0000\ndiff --git a/t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master b/t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..main\nsimilarity index 99%\nrename from t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master\nrename to t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..main\nindex 02c4db7ec5..8e889090fb 100644\n--- a/t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master\n+++ b/t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..main\n@@ -1,4 +1,4 @@\n-$ git format-patch --inline --stdout --numbered-files initial..master\n+$ git format-patch --inline --stdout --numbered-files initial..main\n From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001\n From: A U Thor \n Date: Mon, 26 Jun 2006 00:01:00 +0000\ndiff --git a/t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master b/t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..main\nsimilarity index 99%\nrename from t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master\nrename to t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..main\nindex c7677c5951..d7d2b12d15 100644\n--- a/t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master\n+++ b/t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..main\n@@ -1,4 +1,4 @@\n-$ git format-patch --inline --stdout --subject-prefix=TESTCASE initial..master\n+$ git format-patch --inline --stdout --subject-prefix=TESTCASE initial..main\n From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001\n From: A U Thor \n Date: Mon, 26 Jun 2006 00:01:00 +0000\ndiff --git a/t/t4013/diff.format-patch_--inline_--stdout_initial..master b/t/t4013/diff.format-patch_--inline_--stdout_initial..main\nsimilarity index 98%\nrename from t/t4013/diff.format-patch_--inline_--stdout_initial..master\nrename to t/t4013/diff.format-patch_--inline_--stdout_initial..main\nindex 5b3e34e2c0..c49c423f82 100644\n--- a/t/t4013/diff.format-patch_--inline_--stdout_initial..master\n+++ b/t/t4013/diff.format-patch_--inline_--stdout_initial..main\n@@ -1,4 +1,4 @@\n-$ git format-patch --inline --stdout initial..master\n+$ git format-patch --inline --stdout initial..main\n From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001\n From: A U Thor \n Date: Mon, 26 Jun 2006 00:01:00 +0000\ndiff --git a/t/t4013/diff.format-patch_--inline_--stdout_initial..master^ b/t/t4013/diff.format-patch_--inline_--stdout_initial..main^\nsimilarity index 97%\nrename from t/t4013/diff.format-patch_--inline_--stdout_initial..master^\nrename to t/t4013/diff.format-patch_--inline_--stdout_initial..main^\nindex d13f8a8128..8669dbfe6c 100644\n--- a/t/t4013/diff.format-patch_--inline_--stdout_initial..master^\n+++ b/t/t4013/diff.format-patch_--inline_--stdout_initial..main^\n@@ -1,4 +1,4 @@\n-$ git format-patch --inline --stdout initial..master^\n+$ git format-patch --inline --stdout initial..main^\n From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001\n From: A U Thor \n Date: Mon, 26 Jun 2006 00:01:00 +0000\ndiff --git a/t/t4013/diff.format-patch_--inline_--stdout_initial..master^^ b/t/t4013/diff.format-patch_--inline_--stdout_initial..main^^\nsimilarity index 95%\nrename from t/t4013/diff.format-patch_--inline_--stdout_initial..master^^\nrename to t/t4013/diff.format-patch_--inline_--stdout_initial..main^^\nindex caec5537de..b749be58b0 100644\n--- a/t/t4013/diff.format-patch_--inline_--stdout_initial..master^^\n+++ b/t/t4013/diff.format-patch_--inline_--stdout_initial..main^^\n@@ -1,4 +1,4 @@\n-$ git format-patch --inline --stdout initial..master^^\n+$ git format-patch --inline --stdout initial..main^^\n From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001\n From: A U Thor \n Date: Mon, 26 Jun 2006 00:01:00 +0000\ndiff --git a/t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^ b/t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..main^\nsimilarity index 96%\nrename from t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^\nrename to t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..main^\nindex 244d964fc6..567f222198 100644\n--- a/t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^\n+++ b/t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..main^\n@@ -1,4 +1,4 @@\n-$ git format-patch --stdout --cover-letter -n initial..master^\n+$ git format-patch --stdout --cover-letter -n initial..main^\n From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001\n From: C O Mitter \n Date: Mon, 26 Jun 2006 00:06:00 +0000\ndiff --git a/t/t4013/diff.format-patch_--stdout_--no-numbered_initial..master b/t/t4013/diff.format-patch_--stdout_--no-numbered_initial..main\nsimilarity index 97%\nrename from t/t4013/diff.format-patch_--stdout_--no-numbered_initial..master\nrename to t/t4013/diff.format-patch_--stdout_--no-numbered_initial..main\nindex bfc287a147..195b62ea4f 100644\n--- a/t/t4013/diff.format-patch_--stdout_--no-numbered_initial..master\n+++ b/t/t4013/diff.format-patch_--stdout_--no-numbered_initial..main\n@@ -1,4 +1,4 @@\n-$ git format-patch --stdout --no-numbered initial..master\n+$ git format-patch --stdout --no-numbered initial..main\n From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001\n From: A U Thor \n Date: Mon, 26 Jun 2006 00:01:00 +0000\ndiff --git a/t/t4013/diff.format-patch_--stdout_--numbered_initial..master b/t/t4013/diff.format-patch_--stdout_--numbered_initial..main\nsimilarity index 97%\nrename from t/t4013/diff.format-patch_--stdout_--numbered_initial..master\nrename to t/t4013/diff.format-patch_--stdout_--numbered_initial..main\nindex 568f6f584e..0678a38515 100644\n--- a/t/t4013/diff.format-patch_--stdout_--numbered_initial..master\n+++ b/t/t4013/diff.format-patch_--stdout_--numbered_initial..main\n@@ -1,4 +1,4 @@\n-$ git format-patch --stdout --numbered initial..master\n+$ git format-patch --stdout --numbered initial..main\n From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001\n From: A U Thor \n Date: Mon, 26 Jun 2006 00:01:00 +0000\ndiff --git a/t/t4013/diff.format-patch_--stdout_initial..master b/t/t4013/diff.format-patch_--stdout_initial..main\nsimilarity index 97%\nrename from t/t4013/diff.format-patch_--stdout_initial..master\nrename to t/t4013/diff.format-patch_--stdout_initial..main\nindex 5f0352f9f7..b4a6302e7c 100644\n--- a/t/t4013/diff.format-patch_--stdout_initial..master\n+++ b/t/t4013/diff.format-patch_--stdout_initial..main\n@@ -1,4 +1,4 @@\n-$ git format-patch --stdout initial..master\n+$ git format-patch --stdout initial..main\n From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001\n From: A U Thor \n Date: Mon, 26 Jun 2006 00:01:00 +0000\ndiff --git a/t/t4013/diff.format-patch_--stdout_initial..master^ b/t/t4013/diff.format-patch_--stdout_initial..main^\nsimilarity index 96%\nrename from t/t4013/diff.format-patch_--stdout_initial..master^\nrename to t/t4013/diff.format-patch_--stdout_initial..main^\nindex 2ae454d807..36b3221582 100644\n--- a/t/t4013/diff.format-patch_--stdout_initial..master^\n+++ b/t/t4013/diff.format-patch_--stdout_initial..main^\n@@ -1,4 +1,4 @@\n-$ git format-patch --stdout initial..master^\n+$ git format-patch --stdout initial..main^\n From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001\n From: A U Thor \n Date: Mon, 26 Jun 2006 00:01:00 +0000\ndiff --git a/t/t4013/diff.log_--decorate=full_--all b/t/t4013/diff.log_--decorate=full_--all\nindex 3f9b872ece..7cfd2ea22d 100644\n--- a/t/t4013/diff.log_--decorate=full_--all\n+++ b/t/t4013/diff.log_--decorate=full_--all\n@@ -26,7 +26,7 @@ Date: Mon Jun 26 00:06:00 2006 +0000\n \n Notes added by 'git notes add'\n \n-commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> refs/heads/master)\n+commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> refs/heads/main)\n Merge: 9a6d494 c7a2ab9\n Author: A U Thor \n Date: Mon Jun 26 00:04:00 2006 +0000\ndiff --git a/t/t4013/diff.log_--decorate_--all b/t/t4013/diff.log_--decorate_--all\nindex f5e20e1e14..735f1aa83c 100644\n--- a/t/t4013/diff.log_--decorate_--all\n+++ b/t/t4013/diff.log_--decorate_--all\n@@ -26,7 +26,7 @@ Date: Mon Jun 26 00:06:00 2006 +0000\n \n Notes added by 'git notes add'\n \n-commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> master)\n+commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> main)\n Merge: 9a6d494 c7a2ab9\n Author: A U Thor \n Date: Mon Jun 26 00:04:00 2006 +0000\ndiff --git a/t/t4013/diff.log_--no-diff-merges_-p_--first-parent_master b/t/t4013/diff.log_--diff-merges=off_-p_--first-parent_main\nsimilarity index 95%\nrename from t/t4013/diff.log_--no-diff-merges_-p_--first-parent_master\nrename to t/t4013/diff.log_--diff-merges=off_-p_--first-parent_main\nindex 597002232e..fe180fda3b 100644\n--- a/t/t4013/diff.log_--no-diff-merges_-p_--first-parent_master\n+++ b/t/t4013/diff.log_--diff-merges=off_-p_--first-parent_main\n@@ -1,4 +1,4 @@\n-$ git log --no-diff-merges -p --first-parent master\n+$ git log --diff-merges=off -p --first-parent main\n commit 59d314ad6f356dd08601a4cd5e530381da3e3c64\n Merge: 9a6d494 c7a2ab9\n Author: A U Thor \ndiff --git a/t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master b/t/t4013/diff.log_--first-parent_--diff-merges=off_-p_main\nsimilarity index 95%\nrename from t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master\nrename to t/t4013/diff.log_--first-parent_--diff-merges=off_-p_main\nindex 5d7461a167..dca62d4e60 100644\n--- a/t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master\n+++ b/t/t4013/diff.log_--first-parent_--diff-merges=off_-p_main\n@@ -1,4 +1,4 @@\n-$ git log --first-parent --diff-merges=off -p master\n+$ git log --first-parent --diff-merges=off -p main\n commit 80e25ffa65bcdbe82ef654b4d06dbbde7945c37f\n Merge: 9a6d494 c7a2ab9\n Author: A U Thor \ndiff --git a/t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master b/t/t4013/diff.log_--no-diff-merges_-p_--first-parent_main\nsimilarity index 95%\nrename from t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master\nrename to t/t4013/diff.log_--no-diff-merges_-p_--first-parent_main\nindex 194e893c94..0b54118088 100644\n--- a/t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master\n+++ b/t/t4013/diff.log_--no-diff-merges_-p_--first-parent_main\n@@ -1,4 +1,4 @@\n-$ git log --diff-merges=off -p --first-parent master\n+$ git log --no-diff-merges -p --first-parent main\n commit 59d314ad6f356dd08601a4cd5e530381da3e3c64\n Merge: 9a6d494 c7a2ab9\n Author: A U Thor \ndiff --git a/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_ b/t/t4013/diff.log_--patch-with-stat_--summary_main_--_dir_\nsimilarity index 96%\nrename from t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_\nrename to t/t4013/diff.log_--patch-with-stat_--summary_main_--_dir_\nindex a18f1472a9..3ed46cc867 100644\n--- a/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_\n+++ b/t/t4013/diff.log_--patch-with-stat_--summary_main_--_dir_\n@@ -1,4 +1,4 @@\n-$ git log --patch-with-stat --summary master -- dir/\n+$ git log --patch-with-stat --summary main -- dir/\n commit 59d314ad6f356dd08601a4cd5e530381da3e3c64\n Merge: 9a6d494 c7a2ab9\n Author: A U Thor \ndiff --git a/t/t4013/diff.log_--patch-with-stat_master b/t/t4013/diff.log_--patch-with-stat_main\nsimilarity index 98%\nrename from t/t4013/diff.log_--patch-with-stat_master\nrename to t/t4013/diff.log_--patch-with-stat_main\nindex ae425c4672..2e12b557cb 100644\n--- a/t/t4013/diff.log_--patch-with-stat_master\n+++ b/t/t4013/diff.log_--patch-with-stat_main\n@@ -1,4 +1,4 @@\n-$ git log --patch-with-stat master\n+$ git log --patch-with-stat main\n commit 59d314ad6f356dd08601a4cd5e530381da3e3c64\n Merge: 9a6d494 c7a2ab9\n Author: A U Thor \ndiff --git a/t/t4013/diff.log_--patch-with-stat_master_--_dir_ b/t/t4013/diff.log_--patch-with-stat_main_--_dir_\nsimilarity index 96%\nrename from t/t4013/diff.log_--patch-with-stat_master_--_dir_\nrename to t/t4013/diff.log_--patch-with-stat_main_--_dir_\nindex d5207cadf4..d511ea7f6b 100644\n--- a/t/t4013/diff.log_--patch-with-stat_master_--_dir_\n+++ b/t/t4013/diff.log_--patch-with-stat_main_--_dir_\n@@ -1,4 +1,4 @@\n-$ git log --patch-with-stat master -- dir/\n+$ git log --patch-with-stat main -- dir/\n commit 59d314ad6f356dd08601a4cd5e530381da3e3c64\n Merge: 9a6d494 c7a2ab9\n Author: A U Thor \ndiff --git a/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master b/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_main\nsimilarity index 98%\nrename from t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master\nrename to t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_main\nindex 0fc1e8cd71..3cfd0e6422 100644\n--- a/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master\n+++ b/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_main\n@@ -1,4 +1,4 @@\n-$ git log --root --cc --patch-with-stat --summary master\n+$ git log --root --cc --patch-with-stat --summary main\n commit 59d314ad6f356dd08601a4cd5e530381da3e3c64\n Merge: 9a6d494 c7a2ab9\n Author: A U Thor \ndiff --git a/t/t4013/diff.log_--root_--patch-with-stat_--summary_master b/t/t4013/diff.log_--root_--patch-with-stat_--summary_main\nsimilarity index 98%\nrename from t/t4013/diff.log_--root_--patch-with-stat_--summary_master\nrename to t/t4013/diff.log_--root_--patch-with-stat_--summary_main\nindex dffc09dde9..9f4d6dfa44 100644\n--- a/t/t4013/diff.log_--root_--patch-with-stat_--summary_master\n+++ b/t/t4013/diff.log_--root_--patch-with-stat_--summary_main\n@@ -1,4 +1,4 @@\n-$ git log --root --patch-with-stat --summary master\n+$ git log --root --patch-with-stat --summary main\n commit 59d314ad6f356dd08601a4cd5e530381da3e3c64\n Merge: 9a6d494 c7a2ab9\n Author: A U Thor \ndiff --git a/t/t4013/diff.log_--root_--patch-with-stat_master b/t/t4013/diff.log_--root_--patch-with-stat_main\nsimilarity index 98%\nrename from t/t4013/diff.log_--root_--patch-with-stat_master\nrename to t/t4013/diff.log_--root_--patch-with-stat_main\nindex 55aa98012d..0d69ae2e11 100644\n--- a/t/t4013/diff.log_--root_--patch-with-stat_master\n+++ b/t/t4013/diff.log_--root_--patch-with-stat_main\n@@ -1,4 +1,4 @@\n-$ git log --root --patch-with-stat master\n+$ git log --root --patch-with-stat main\n commit 59d314ad6f356dd08601a4cd5e530381da3e3c64\n Merge: 9a6d494 c7a2ab9\n Author: A U Thor \ndiff --git a/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master b/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_main\nsimilarity index 98%\nrename from t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master\nrename to t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_main\nindex 019d85f7de..1b71add9de 100644\n--- a/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master\n+++ b/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_main\n@@ -1,4 +1,4 @@\n-$ git log --root -c --patch-with-stat --summary master\n+$ git log --root -c --patch-with-stat --summary main\n commit 59d314ad6f356dd08601a4cd5e530381da3e3c64\n Merge: 9a6d494 c7a2ab9\n Author: A U Thor \ndiff --git a/t/t4013/diff.log_--root_-p_master b/t/t4013/diff.log_--root_-p_main\nsimilarity index 98%\nrename from t/t4013/diff.log_--root_-p_master\nrename to t/t4013/diff.log_--root_-p_main\nindex b42c334439..04581296ed 100644\n--- a/t/t4013/diff.log_--root_-p_master\n+++ b/t/t4013/diff.log_--root_-p_main\n@@ -1,4 +1,4 @@\n-$ git log --root -p master\n+$ git log --root -p main\n commit 59d314ad6f356dd08601a4cd5e530381da3e3c64\n Merge: 9a6d494 c7a2ab9\n Author: A U Thor \ndiff --git a/t/t4013/diff.log_--root_master b/t/t4013/diff.log_--root_main\nsimilarity index 96%\nrename from t/t4013/diff.log_--root_master\nrename to t/t4013/diff.log_--root_main\nindex e8f46159da..d5e90fd6b4 100644\n--- a/t/t4013/diff.log_--root_master\n+++ b/t/t4013/diff.log_--root_main\n@@ -1,4 +1,4 @@\n-$ git log --root master\n+$ git log --root main\n commit 59d314ad6f356dd08601a4cd5e530381da3e3c64\n Merge: 9a6d494 c7a2ab9\n Author: A U Thor \ndiff --git a/t/t4013/diff.log_-GF_-p_--pickaxe-all_master b/t/t4013/diff.log_-GF_-p_--pickaxe-all_main\nsimilarity index 90%\nrename from t/t4013/diff.log_-GF_-p_--pickaxe-all_master\nrename to t/t4013/diff.log_-GF_-p_--pickaxe-all_main\nindex d36f88098b..1f7a497c2d 100644\n--- a/t/t4013/diff.log_-GF_-p_--pickaxe-all_master\n+++ b/t/t4013/diff.log_-GF_-p_--pickaxe-all_main\n@@ -1,4 +1,4 @@\n-$ git log -GF -p --pickaxe-all master\n+$ git log -GF -p --pickaxe-all main\n commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0\n Author: A U Thor \n Date: Mon Jun 26 00:02:00 2006 +0000\ndiff --git a/t/t4013/diff.log_-GF_-p_master b/t/t4013/diff.log_-GF_-p_main\nsimilarity index 91%\nrename from t/t4013/diff.log_-GF_-p_master\nrename to t/t4013/diff.log_-GF_-p_main\nindex 9d93f2c23a..c80dda41e9 100644\n--- a/t/t4013/diff.log_-GF_-p_master\n+++ b/t/t4013/diff.log_-GF_-p_main\n@@ -1,4 +1,4 @@\n-$ git log -GF -p master\n+$ git log -GF -p main\n commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0\n Author: A U Thor \n Date: Mon Jun 26 00:02:00 2006 +0000\ndiff --git a/t/t4013/diff.log_-SF_master b/t/t4013/diff.log_-GF_main\nsimilarity index 86%\nrename from t/t4013/diff.log_-SF_master\nrename to t/t4013/diff.log_-GF_main\nindex c1599f2f52..b94a7f7839 100644\n--- a/t/t4013/diff.log_-SF_master\n+++ b/t/t4013/diff.log_-GF_main\n@@ -1,4 +1,4 @@\n-$ git log -SF master\n+$ git log -GF main\n commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0\n Author: A U Thor \n Date: Mon Jun 26 00:02:00 2006 +0000\ndiff --git a/t/t4013/diff.log_-SF_-p_master b/t/t4013/diff.log_-SF_-p_main\nsimilarity index 91%\nrename from t/t4013/diff.log_-SF_-p_master\nrename to t/t4013/diff.log_-SF_-p_main\nindex 5e32438972..fa82ac1490 100644\n--- a/t/t4013/diff.log_-SF_-p_master\n+++ b/t/t4013/diff.log_-SF_-p_main\n@@ -1,4 +1,4 @@\n-$ git log -SF -p master\n+$ git log -SF -p main\n commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0\n Author: A U Thor \n Date: Mon Jun 26 00:02:00 2006 +0000\ndiff --git a/t/t4013/diff.log_-GF_master b/t/t4013/diff.log_-SF_main\nsimilarity index 86%\nrename from t/t4013/diff.log_-GF_master\nrename to t/t4013/diff.log_-SF_main\nindex 4c6708d2d0..dbf770db49 100644\n--- a/t/t4013/diff.log_-GF_master\n+++ b/t/t4013/diff.log_-SF_main\n@@ -1,4 +1,4 @@\n-$ git log -GF master\n+$ git log -SF main\n commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0\n Author: A U Thor \n Date: Mon Jun 26 00:02:00 2006 +0000\ndiff --git a/t/t4013/diff.log_-SF_main_--max-count=0 b/t/t4013/diff.log_-SF_main_--max-count=0\nnew file mode 100644\nindex 0000000000..683b17eb99\n--- /dev/null\n+++ b/t/t4013/diff.log_-SF_main_--max-count=0\n@@ -0,0 +1,2 @@\n+$ git log -SF main --max-count=0\n+$\ndiff --git a/t/t4013/diff.log_-SF_master_--max-count=2 b/t/t4013/diff.log_-SF_main_--max-count=1\nsimilarity index 79%\nrename from t/t4013/diff.log_-SF_master_--max-count=2\nrename to t/t4013/diff.log_-SF_main_--max-count=1\nindex a6c55fd482..2102426f8c 100644\n--- a/t/t4013/diff.log_-SF_master_--max-count=2\n+++ b/t/t4013/diff.log_-SF_main_--max-count=1\n@@ -1,4 +1,4 @@\n-$ git log -SF master --max-count=2\n+$ git log -SF main --max-count=1\n commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0\n Author: A U Thor \n Date: Mon Jun 26 00:02:00 2006 +0000\ndiff --git a/t/t4013/diff.log_-SF_main_--max-count=2 b/t/t4013/diff.log_-SF_main_--max-count=2\nnew file mode 100644\nindex 0000000000..23e12a4cbb\n--- /dev/null\n+++ b/t/t4013/diff.log_-SF_main_--max-count=2\n@@ -0,0 +1,7 @@\n+$ git log -SF main --max-count=2\n+commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0\n+Author: A U Thor \n+Date: Mon Jun 26 00:02:00 2006 +0000\n+\n+ Third\n+$\ndiff --git a/t/t4013/diff.log_-SF_master_--max-count=0 b/t/t4013/diff.log_-SF_master_--max-count=0\ndeleted file mode 100644\nindex c1fc6c8731..0000000000\n--- a/t/t4013/diff.log_-SF_master_--max-count=0\n+++ /dev/null\n@@ -1,2 +0,0 @@\n-$ git log -SF master --max-count=0\n-$\ndiff --git a/t/t4013/diff.log_-SF_master_--max-count=1 b/t/t4013/diff.log_-SF_master_--max-count=1\ndeleted file mode 100644\nindex c981a03814..0000000000\n--- a/t/t4013/diff.log_-SF_master_--max-count=1\n+++ /dev/null\n@@ -1,7 +0,0 @@\n-$ git log -SF master --max-count=1\n-commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0\n-Author: A U Thor \n-Date: Mon Jun 26 00:02:00 2006 +0000\n-\n- Third\n-$\ndiff --git a/t/t4013/diff.log_-S_F_master b/t/t4013/diff.log_-S_F_main\nsimilarity index 86%\nrename from t/t4013/diff.log_-S_F_master\nrename to t/t4013/diff.log_-S_F_main\nindex 978d2b4118..a75a42e143 100644\n--- a/t/t4013/diff.log_-S_F_master\n+++ b/t/t4013/diff.log_-S_F_main\n@@ -1,4 +1,4 @@\n-$ git log -S F master\n+$ git log -S F main\n commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0\n Author: A U Thor \n Date: Mon Jun 26 00:02:00 2006 +0000\ndiff --git a/t/t4013/diff.log_-m_-p_--first-parent_master b/t/t4013/diff.log_-m_-p_--first-parent_main\nsimilarity index 97%\nrename from t/t4013/diff.log_-m_-p_--first-parent_master\nrename to t/t4013/diff.log_-m_-p_--first-parent_main\nindex 7a0073f529..459e10786b 100644\n--- a/t/t4013/diff.log_-m_-p_--first-parent_master\n+++ b/t/t4013/diff.log_-m_-p_--first-parent_main\n@@ -1,4 +1,4 @@\n-$ git log -m -p --first-parent master\n+$ git log -m -p --first-parent main\n commit 59d314ad6f356dd08601a4cd5e530381da3e3c64\n Merge: 9a6d494 c7a2ab9\n Author: A U Thor \ndiff --git a/t/t4013/diff.log_-m_-p_master b/t/t4013/diff.log_-m_-p_main\nsimilarity index 99%\nrename from t/t4013/diff.log_-m_-p_master\nrename to t/t4013/diff.log_-m_-p_main\nindex 9ca62a01ed..07453c5698 100644\n--- a/t/t4013/diff.log_-m_-p_master\n+++ b/t/t4013/diff.log_-m_-p_main\n@@ -1,4 +1,4 @@\n-$ git log -m -p master\n+$ git log -m -p main\n commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0)\n Merge: 9a6d494 c7a2ab9\n Author: A U Thor \ndiff --git a/t/t4013/diff.log_-p_--first-parent_master b/t/t4013/diff.log_-p_--first-parent_main\nsimilarity index 97%\nrename from t/t4013/diff.log_-p_--first-parent_master\nrename to t/t4013/diff.log_-p_--first-parent_main\nindex 28840ebea1..247980817b 100644\n--- a/t/t4013/diff.log_-p_--first-parent_master\n+++ b/t/t4013/diff.log_-p_--first-parent_main\n@@ -1,4 +1,4 @@\n-$ git log -p --first-parent master\n+$ git log -p --first-parent main\n commit 59d314ad6f356dd08601a4cd5e530381da3e3c64\n Merge: 9a6d494 c7a2ab9\n Author: A U Thor \ndiff --git a/t/t4013/diff.log_-p_master b/t/t4013/diff.log_-p_main\nsimilarity index 98%\nrename from t/t4013/diff.log_-p_master\nrename to t/t4013/diff.log_-p_main\nindex bf1326dc36..c82b4dbf16 100644\n--- a/t/t4013/diff.log_-p_master\n+++ b/t/t4013/diff.log_-p_main\n@@ -1,4 +1,4 @@\n-$ git log -p master\n+$ git log -p main\n commit 59d314ad6f356dd08601a4cd5e530381da3e3c64\n Merge: 9a6d494 c7a2ab9\n Author: A U Thor \ndiff --git a/t/t4013/diff.log_master b/t/t4013/diff.log_main\nsimilarity index 97%\nrename from t/t4013/diff.log_master\nrename to t/t4013/diff.log_main\nindex a8f6ce5abd..50401f73e6 100644\n--- a/t/t4013/diff.log_master\n+++ b/t/t4013/diff.log_main\n@@ -1,4 +1,4 @@\n-$ git log master\n+$ git log main\n commit 59d314ad6f356dd08601a4cd5e530381da3e3c64\n Merge: 9a6d494 c7a2ab9\n Author: A U Thor \ndiff --git a/t/t4013/diff.noellipses-diff-tree_-c_--abbrev_master b/t/t4013/diff.noellipses-diff-tree_-c_--abbrev_main\nsimilarity index 81%\nrename from t/t4013/diff.noellipses-diff-tree_-c_--abbrev_master\nrename to t/t4013/diff.noellipses-diff-tree_-c_--abbrev_main\nindex bb80f013b3..3aa1f80af3 100644\n--- a/t/t4013/diff.noellipses-diff-tree_-c_--abbrev_master\n+++ b/t/t4013/diff.noellipses-diff-tree_-c_--abbrev_main\n@@ -1,4 +1,4 @@\n-$ git diff-tree -c --abbrev master\n+$ git diff-tree -c --abbrev main\n 59d314ad6f356dd08601a4cd5e530381da3e3c64\n ::100644 100644 100644 cead32e 7289e35 992913c MM\tdir/sub\n ::100644 100644 100644 b414108 f4615da 10a8a9f MM\tfile0\ndiff --git a/t/t4013/diff.noellipses-whatchanged_--root_master b/t/t4013/diff.noellipses-whatchanged_--root_main\nsimilarity index 96%\nrename from t/t4013/diff.noellipses-whatchanged_--root_master\nrename to t/t4013/diff.noellipses-whatchanged_--root_main\nindex c2cfd4e729..2bec055835 100644\n--- a/t/t4013/diff.noellipses-whatchanged_--root_master\n+++ b/t/t4013/diff.noellipses-whatchanged_--root_main\n@@ -1,4 +1,4 @@\n-$ git whatchanged --root master\n+$ git whatchanged --root main\n commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a\n Author: A U Thor \n Date: Mon Jun 26 00:03:00 2006 +0000\ndiff --git a/t/t4013/diff.noellipses-whatchanged_-SF_master b/t/t4013/diff.noellipses-whatchanged_-SF_main\nsimilarity index 86%\nrename from t/t4013/diff.noellipses-whatchanged_-SF_master\nrename to t/t4013/diff.noellipses-whatchanged_-SF_main\nindex b36ce5886e..0c1476d19e 100644\n--- a/t/t4013/diff.noellipses-whatchanged_-SF_master\n+++ b/t/t4013/diff.noellipses-whatchanged_-SF_main\n@@ -1,4 +1,4 @@\n-$ git whatchanged -SF master\n+$ git whatchanged -SF main\n commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0\n Author: A U Thor \n Date: Mon Jun 26 00:02:00 2006 +0000\ndiff --git a/t/t4013/diff.noellipses-whatchanged_master b/t/t4013/diff.noellipses-whatchanged_main\nsimilarity index 96%\nrename from t/t4013/diff.noellipses-whatchanged_master\nrename to t/t4013/diff.noellipses-whatchanged_main\nindex 55e500f2ed..c48d2851aa 100644\n--- a/t/t4013/diff.noellipses-whatchanged_master\n+++ b/t/t4013/diff.noellipses-whatchanged_main\n@@ -1,4 +1,4 @@\n-$ git whatchanged master\n+$ git whatchanged main\n commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a\n Author: A U Thor \n Date: Mon Jun 26 00:03:00 2006 +0000\ndiff --git a/t/t4013/diff.show_--first-parent_master b/t/t4013/diff.show_--first-parent_main\nsimilarity index 92%\nrename from t/t4013/diff.show_--first-parent_master\nrename to t/t4013/diff.show_--first-parent_main\nindex 3dcbe473a0..480502d65c 100644\n--- a/t/t4013/diff.show_--first-parent_master\n+++ b/t/t4013/diff.show_--first-parent_main\n@@ -1,4 +1,4 @@\n-$ git show --first-parent master\n+$ git show --first-parent main\n commit 59d314ad6f356dd08601a4cd5e530381da3e3c64\n Merge: 9a6d494 c7a2ab9\n Author: A U Thor \ndiff --git a/t/t4013/diff.show_-c_master b/t/t4013/diff.show_-c_main\nsimilarity index 95%\nrename from t/t4013/diff.show_-c_master\nrename to t/t4013/diff.show_-c_main\nindex 81aba8da96..74ef8bc96b 100644\n--- a/t/t4013/diff.show_-c_master\n+++ b/t/t4013/diff.show_-c_main\n@@ -1,4 +1,4 @@\n-$ git show -c master\n+$ git show -c main\n commit 59d314ad6f356dd08601a4cd5e530381da3e3c64\n Merge: 9a6d494 c7a2ab9\n Author: A U Thor \ndiff --git a/t/t4013/diff.show_-m_master b/t/t4013/diff.show_-m_main\nsimilarity index 98%\nrename from t/t4013/diff.show_-m_master\nrename to t/t4013/diff.show_-m_main\nindex 4ea2ee453d..8fd56736d9 100644\n--- a/t/t4013/diff.show_-m_master\n+++ b/t/t4013/diff.show_-m_main\n@@ -1,4 +1,4 @@\n-$ git show -m master\n+$ git show -m main\n commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0)\n Merge: 9a6d494 c7a2ab9\n Author: A U Thor \ndiff --git a/t/t4013/diff.show_master b/t/t4013/diff.show_main\nsimilarity index 96%\nrename from t/t4013/diff.show_master\nrename to t/t4013/diff.show_main\nindex fb08ce0e46..630b52a95e 100644\n--- a/t/t4013/diff.show_master\n+++ b/t/t4013/diff.show_main\n@@ -1,4 +1,4 @@\n-$ git show master\n+$ git show main\n commit 59d314ad6f356dd08601a4cd5e530381da3e3c64\n Merge: 9a6d494 c7a2ab9\n Author: A U Thor \ndiff --git a/t/t4013/diff.whatchanged_--patch-with-stat_--summary_master_--_dir_ b/t/t4013/diff.whatchanged_--patch-with-stat_--summary_main_--_dir_\nsimilarity index 94%\nrename from t/t4013/diff.whatchanged_--patch-with-stat_--summary_master_--_dir_\nrename to t/t4013/diff.whatchanged_--patch-with-stat_--summary_main_--_dir_\nindex c8b6af2f43..ce0754d556 100644\n--- a/t/t4013/diff.whatchanged_--patch-with-stat_--summary_master_--_dir_\n+++ b/t/t4013/diff.whatchanged_--patch-with-stat_--summary_main_--_dir_\n@@ -1,4 +1,4 @@\n-$ git whatchanged --patch-with-stat --summary master -- dir/\n+$ git whatchanged --patch-with-stat --summary main -- dir/\n commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a\n Author: A U Thor \n Date: Mon Jun 26 00:03:00 2006 +0000\ndiff --git a/t/t4013/diff.whatchanged_--patch-with-stat_master b/t/t4013/diff.whatchanged_--patch-with-stat_main\nsimilarity index 97%\nrename from t/t4013/diff.whatchanged_--patch-with-stat_master\nrename to t/t4013/diff.whatchanged_--patch-with-stat_main\nindex 1ac431ba92..aabccf39a5 100644\n--- a/t/t4013/diff.whatchanged_--patch-with-stat_master\n+++ b/t/t4013/diff.whatchanged_--patch-with-stat_main\n@@ -1,4 +1,4 @@\n-$ git whatchanged --patch-with-stat master\n+$ git whatchanged --patch-with-stat main\n commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a\n Author: A U Thor \n Date: Mon Jun 26 00:03:00 2006 +0000\ndiff --git a/t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_ b/t/t4013/diff.whatchanged_--patch-with-stat_main_--_dir_\nsimilarity index 94%\nrename from t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_\nrename to t/t4013/diff.whatchanged_--patch-with-stat_main_--_dir_\nindex b30c28588f..c05a0e8149 100644\n--- a/t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_\n+++ b/t/t4013/diff.whatchanged_--patch-with-stat_main_--_dir_\n@@ -1,4 +1,4 @@\n-$ git whatchanged --patch-with-stat master -- dir/\n+$ git whatchanged --patch-with-stat main -- dir/\n commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a\n Author: A U Thor \n Date: Mon Jun 26 00:03:00 2006 +0000\ndiff --git a/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master b/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_main\nsimilarity index 97%\nrename from t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master\nrename to t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_main\nindex 30aae7817b..1f74b1b548 100644\n--- a/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master\n+++ b/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_main\n@@ -1,4 +1,4 @@\n-$ git whatchanged --root --cc --patch-with-stat --summary master\n+$ git whatchanged --root --cc --patch-with-stat --summary main\n commit 59d314ad6f356dd08601a4cd5e530381da3e3c64\n Merge: 9a6d494 c7a2ab9\n Author: A U Thor \ndiff --git a/t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_master b/t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_main\nsimilarity index 97%\nrename from t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_master\nrename to t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_main\nindex db90e51525..80d9812151 100644\n--- a/t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_master\n+++ b/t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_main\n@@ -1,4 +1,4 @@\n-$ git whatchanged --root --patch-with-stat --summary master\n+$ git whatchanged --root --patch-with-stat --summary main\n commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a\n Author: A U Thor \n Date: Mon Jun 26 00:03:00 2006 +0000\ndiff --git a/t/t4013/diff.whatchanged_--root_--patch-with-stat_master b/t/t4013/diff.whatchanged_--root_--patch-with-stat_main\nsimilarity index 97%\nrename from t/t4013/diff.whatchanged_--root_--patch-with-stat_master\nrename to t/t4013/diff.whatchanged_--root_--patch-with-stat_main\nindex 9a6cc92ce7..c0b9082a2c 100644\n--- a/t/t4013/diff.whatchanged_--root_--patch-with-stat_master\n+++ b/t/t4013/diff.whatchanged_--root_--patch-with-stat_main\n@@ -1,4 +1,4 @@\n-$ git whatchanged --root --patch-with-stat master\n+$ git whatchanged --root --patch-with-stat main\n commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a\n Author: A U Thor \n Date: Mon Jun 26 00:03:00 2006 +0000\ndiff --git a/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master b/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_main\nsimilarity index 97%\nrename from t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master\nrename to t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_main\nindex d1d32bd34c..0002c6912e 100644\n--- a/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master\n+++ b/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_main\n@@ -1,4 +1,4 @@\n-$ git whatchanged --root -c --patch-with-stat --summary master\n+$ git whatchanged --root -c --patch-with-stat --summary main\n commit 59d314ad6f356dd08601a4cd5e530381da3e3c64\n Merge: 9a6d494 c7a2ab9\n Author: A U Thor \ndiff --git a/t/t4013/diff.whatchanged_--root_-p_master b/t/t4013/diff.whatchanged_--root_-p_main\nsimilarity index 98%\nrename from t/t4013/diff.whatchanged_--root_-p_master\nrename to t/t4013/diff.whatchanged_--root_-p_main\nindex ebf1f0661e..39f3e2be74 100644\n--- a/t/t4013/diff.whatchanged_--root_-p_master\n+++ b/t/t4013/diff.whatchanged_--root_-p_main\n@@ -1,4 +1,4 @@\n-$ git whatchanged --root -p master\n+$ git whatchanged --root -p main\n commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a\n Author: A U Thor \n Date: Mon Jun 26 00:03:00 2006 +0000\ndiff --git a/t/t4013/diff.whatchanged_--root_master b/t/t4013/diff.whatchanged_--root_main\nsimilarity index 97%\nrename from t/t4013/diff.whatchanged_--root_master\nrename to t/t4013/diff.whatchanged_--root_main\nindex a405cb6138..36f4d6697f 100644\n--- a/t/t4013/diff.whatchanged_--root_master\n+++ b/t/t4013/diff.whatchanged_--root_main\n@@ -1,4 +1,4 @@\n-$ git whatchanged --root master\n+$ git whatchanged --root main\n commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a\n Author: A U Thor \n Date: Mon Jun 26 00:03:00 2006 +0000\ndiff --git a/t/t4013/diff.whatchanged_-SF_-p_master b/t/t4013/diff.whatchanged_-SF_-p_main\nsimilarity index 89%\nrename from t/t4013/diff.whatchanged_-SF_-p_master\nrename to t/t4013/diff.whatchanged_-SF_-p_main\nindex f39da84822..0e2e67c0df 100644\n--- a/t/t4013/diff.whatchanged_-SF_-p_master\n+++ b/t/t4013/diff.whatchanged_-SF_-p_main\n@@ -1,4 +1,4 @@\n-$ git whatchanged -SF -p master\n+$ git whatchanged -SF -p main\n commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0\n Author: A U Thor \n Date: Mon Jun 26 00:02:00 2006 +0000\ndiff --git a/t/t4013/diff.whatchanged_-SF_master b/t/t4013/diff.whatchanged_-SF_main\nsimilarity index 86%\nrename from t/t4013/diff.whatchanged_-SF_master\nrename to t/t4013/diff.whatchanged_-SF_main\nindex 0499321d0e..34c6bf6b95 100644\n--- a/t/t4013/diff.whatchanged_-SF_master\n+++ b/t/t4013/diff.whatchanged_-SF_main\n@@ -1,4 +1,4 @@\n-$ git whatchanged -SF master\n+$ git whatchanged -SF main\n commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0\n Author: A U Thor \n Date: Mon Jun 26 00:02:00 2006 +0000\ndiff --git a/t/t4013/diff.whatchanged_-p_master b/t/t4013/diff.whatchanged_-p_main\nsimilarity index 98%\nrename from t/t4013/diff.whatchanged_-p_master\nrename to t/t4013/diff.whatchanged_-p_main\nindex f18d43209c..18f3bdeef4 100644\n--- a/t/t4013/diff.whatchanged_-p_master\n+++ b/t/t4013/diff.whatchanged_-p_main\n@@ -1,4 +1,4 @@\n-$ git whatchanged -p master\n+$ git whatchanged -p main\n commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a\n Author: A U Thor \n Date: Mon Jun 26 00:03:00 2006 +0000\ndiff --git a/t/t4013/diff.whatchanged_master b/t/t4013/diff.whatchanged_main\nsimilarity index 97%\nrename from t/t4013/diff.whatchanged_master\nrename to t/t4013/diff.whatchanged_main\nindex cd3bcc2c72..d6c83ed8b0 100644\n--- a/t/t4013/diff.whatchanged_master\n+++ b/t/t4013/diff.whatchanged_main\n@@ -1,4 +1,4 @@\n-$ git whatchanged master\n+$ git whatchanged main\n commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a\n Author: A U Thor \n Date: Mon Jun 26 00:03:00 2006 +0000\n-- \ngitgitgadget\n\n"},{"id":"407901","messageId":"5c29a89d88c57ea5605fafd186534a405c82765b.1603135903.git.gitgitgadget@gmail.com","threadId":"54464","inReplyTo":"pull.758.git.1603135902.gitgitgadget@gmail.com","subject":"[PATCH 09/10] tests: prepare aligned mentions of the default branch name","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-10-19T19:31:40Z","receivedAt":"2020-10-19T19:32:00Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nIn some tests, the default branch name is part of aligned output. As we\nwant to change the default branch name to `main`, which is two\ncharacters shorter than the old default branch name, we will have to\nadjust those tests.\n\nSince we use the original default branch name until the entire test\nsuite has been adjusted accordingly, the touched test cases need to be\nguarded by a prereq (that is so far disabled so that they are skipped\nfor now).\n\nThe test cases that depend on those test cases that are newly guarded by\nthat prereq naturally have to be guarded, too.\n\nSigned-off-by: Johannes Schindelin \n---\n t/t3200-branch.sh | 12 +++---\n t/t3201-branch-contains.sh | 8 ++--\n t/t3203-branch-output.sh | 4 +-\n t/t3205-branch-color.sh | 8 ++--\n t/t5505-remote.sh | 30 +++++++--------\n t/t5510-fetch.sh | 8 ++--\n t/t5526-fetch-submodules.sh | 70 +++++++++++++++++-----------------\n t/t6302-for-each-ref-filter.sh | 24 ++++++------\n 8 files changed, 82 insertions(+), 82 deletions(-)\n\ndiff --git a/t/t3200-branch.sh b/t/t3200-branch.sh\nindex 55b24b76ce..a0b832d59e 100755\n--- a/t/t3200-branch.sh\n+++ b/t/t3200-branch.sh\n@@ -321,11 +321,11 @@ test_expect_success 'git branch --list -v with --abbrev' '\n \n '\n \n-test_expect_success 'git branch --column' '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH 'git branch --column' '\n \tCOLUMNS=81 git branch --column=column >actual &&\n \tcat >expect <<\\EOF &&\n- a/b/c bam foo l * master n o/p r\n- abc bar j/k m/m mb o/o q topic\n+ a/b/c bam foo l * main n o/p r\n+ abc bar j/k m/m mb o/o q topic\n EOF\n \ttest_cmp expect actual\n '\n@@ -358,15 +358,15 @@ EOF\n \ttest_cmp expect actual\n '\n \n-test_expect_success 'git branch with column.*' '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH 'git branch with column.*' '\n \tgit config column.ui column &&\n \tgit config column.branch \"dense\" &&\n \tCOLUMNS=80 git branch >actual &&\n \tgit config --unset column.branch &&\n \tgit config --unset column.ui &&\n \tcat >expect <<\\EOF &&\n- a/b/c bam foo l * master n o/p r\n- abc bar j/k m/m mb o/o q topic\n+ a/b/c bam foo l * main n o/p r\n+ abc bar j/k m/m mb o/o q topic\n EOF\n \ttest_cmp expect actual\n '\ndiff --git a/t/t3201-branch-contains.sh b/t/t3201-branch-contains.sh\nindex efea5c4971..3733cd0091 100755\n--- a/t/t3201-branch-contains.sh\n+++ b/t/t3201-branch-contains.sh\n@@ -242,7 +242,7 @@ test_expect_success 'branch --merged combined with --no-merged' '\n # Here \"topic\" tracks \"master\" with one extra commit, and \"zzz\" points to the\n # same tip as master The name \"zzz\" must come alphabetically after \"topic\"\n # as we process them in that order.\n-test_expect_success 'branch --merged with --verbose' '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH 'branch --merged with --verbose' '\n \tgit branch --track topic master &&\n \tgit branch zzz topic &&\n \tgit checkout topic &&\n@@ -256,9 +256,9 @@ test_expect_success 'branch --merged with --verbose' '\n \ttest_cmp expect actual &&\n \tgit branch --verbose --merged topic >actual &&\n \tcat >expect <<-EOF &&\n-\t master $(git rev-parse --short master) second on master\n-\t* topic $(git rev-parse --short topic ) [ahead 1] foo\n-\t zzz $(git rev-parse --short zzz ) second on master\n+\t main $(git rev-parse --short main) second on main\n+\t* topic $(git rev-parse --short topic ) [ahead 1] foo\n+\t zzz $(git rev-parse --short zzz ) second on main\n \tEOF\n \ttest_i18ncmp expect actual\n '\ndiff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh\nindex 71818b90f0..d65586541d 100755\n--- a/t/t3203-branch-output.sh\n+++ b/t/t3203-branch-output.sh\n@@ -329,7 +329,7 @@ test_expect_success '--color overrides auto-color' '\n \ttest_cmp expect.color actual\n '\n \n-test_expect_success 'verbose output lists worktree path' '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH 'verbose output lists worktree path' '\n \tone=$(git rev-parse --short HEAD) &&\n \ttwo=$(git rev-parse --short master) &&\n \tcat >expect <<-EOF &&\n@@ -337,7 +337,7 @@ test_expect_success 'verbose output lists worktree path' '\n \t ambiguous $one one\n \t branch-one $two two\n \t+ branch-two $one ($(pwd)/worktree_dir) one\n-\t master $two two\n+\t main $two two\n \t ref-to-branch $two two\n \t ref-to-remote $two two\n \tEOF\ndiff --git a/t/t3205-branch-color.sh b/t/t3205-branch-color.sh\nindex 4f1e16bb44..289625c464 100755\n--- a/t/t3205-branch-color.sh\n+++ b/t/t3205-branch-color.sh\n@@ -28,12 +28,12 @@ test_expect_success 'regular output shows colors' '\n \ttest_cmp expect actual\n '\n \n-test_expect_success 'verbose output shows colors' '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH 'verbose output shows colors' '\n \toid=$(git rev-parse --short HEAD) &&\n \tcat >expect <<-EOF &&\n-\t* master $oid foo\n-\t other $oid foo\n-\t remotes/origin/master $oid foo\n+\t* main $oid foo\n+\t other $oid foo\n+\t remotes/origin/main $oid foo\n \tEOF\n \tgit branch --color -v -a >actual.raw &&\n \ttest_decode_color actual &&\ndiff --git a/t/t5505-remote.sh b/t/t5505-remote.sh\nindex 8d62edd98b..de0e3df14a 100755\n--- a/t/t5505-remote.sh\n+++ b/t/t5505-remote.sh\n@@ -200,28 +200,28 @@ cat >test/expect <test/expect < refspec DWIM and advice' '\n \t)\n '\n \n-test_expect_success 'refs/remotes/* refspec and unqualified DWIM and advice' '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH 'refs/remotes/* refspec and unqualified DWIM and advice' '\n \t(\n \t\tcd two &&\n \t\tgit tag -a -m \"Some tag\" my-tag master &&\ndiff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh\nindex dbc724e4c0..5d673358f9 100755\n--- a/t/t5510-fetch.sh\n+++ b/t/t5510-fetch.sh\n@@ -942,7 +942,7 @@ test_expect_success 'fetching with auto-gc does not lock up' '\n \t)\n '\n \n-test_expect_success C_LOCALE_OUTPUT 'fetch aligned output' '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH,C_LOCALE_OUTPUT 'fetch aligned output' '\n \tgit clone . full-output &&\n \ttest_commit looooooooooooong-tag &&\n \t(\n@@ -951,13 +951,13 @@ test_expect_success C_LOCALE_OUTPUT 'fetch aligned output' '\n \t\tgrep -e \"->\" actual | cut -c 22- >../actual\n \t) &&\n \tcat >expect <<-\\EOF &&\n-\tmaster -> origin/master\n+\tmain -> origin/main\n \tlooooooooooooong-tag -> looooooooooooong-tag\n \tEOF\n \ttest_cmp expect actual\n '\n \n-test_expect_success C_LOCALE_OUTPUT 'fetch compact output' '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH,C_LOCALE_OUTPUT 'fetch compact output' '\n \tgit clone . compact &&\n \ttest_commit extraaa &&\n \t(\n@@ -966,7 +966,7 @@ test_expect_success C_LOCALE_OUTPUT 'fetch compact output' '\n \t\tgrep -e \"->\" actual | cut -c 22- >../actual\n \t) &&\n \tcat >expect <<-\\EOF &&\n-\tmaster -> origin/*\n+\tmain -> origin/*\n \textraaa -> *\n \tEOF\n \ttest_cmp expect actual\ndiff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh\nindex 63205dfdf9..dd8e423d25 100755\n--- a/t/t5526-fetch-submodules.sh\n+++ b/t/t5526-fetch-submodules.sh\n@@ -18,7 +18,7 @@ add_upstream_commit() {\n \t\thead2=$(git rev-parse --short HEAD) &&\n \t\techo \"Fetching submodule submodule\" > ../expect.err &&\n \t\techo \"From $pwd/submodule\" >> ../expect.err &&\n-\t\techo \" $head1..$head2 master -> origin/master\" >> ../expect.err\n+\t\techo \" $head1..$head2 main -> origin/main\" >> ../expect.err\n \t) &&\n \t(\n \t\tcd deepsubmodule &&\n@@ -30,7 +30,7 @@ add_upstream_commit() {\n \t\thead2=$(git rev-parse --short HEAD) &&\n \t\techo \"Fetching submodule submodule/subdir/deepsubmodule\" >> ../expect.err\n \t\techo \"From $pwd/deepsubmodule\" >> ../expect.err &&\n-\t\techo \" $head1..$head2 master -> origin/master\" >> ../expect.err\n+\t\techo \" $head1..$head2 main -> origin/main\" >> ../expect.err\n \t)\n }\n \n@@ -61,7 +61,7 @@ test_expect_success setup '\n \t)\n '\n \n-test_expect_success \"fetch --recurse-submodules recurses into submodules\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"fetch --recurse-submodules recurses into submodules\" '\n \tadd_upstream_commit &&\n \t(\n \t\tcd downstream &&\n@@ -71,7 +71,7 @@ test_expect_success \"fetch --recurse-submodules recurses into submodules\" '\n \ttest_i18ncmp expect.err actual.err\n '\n \n-test_expect_success \"submodule.recurse option triggers recursive fetch\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"submodule.recurse option triggers recursive fetch\" '\n \tadd_upstream_commit &&\n \t(\n \t\tcd downstream &&\n@@ -81,7 +81,7 @@ test_expect_success \"submodule.recurse option triggers recursive fetch\" '\n \ttest_i18ncmp expect.err actual.err\n '\n \n-test_expect_success \"fetch --recurse-submodules -j2 has the same output behaviour\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"fetch --recurse-submodules -j2 has the same output behaviour\" '\n \tadd_upstream_commit &&\n \t(\n \t\tcd downstream &&\n@@ -111,7 +111,7 @@ test_expect_success \"fetch --no-recurse-submodules only fetches superproject\" '\n \ttest_must_be_empty actual.err\n '\n \n-test_expect_success \"using fetchRecurseSubmodules=true in .gitmodules recurses into submodules\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"using fetchRecurseSubmodules=true in .gitmodules recurses into submodules\" '\n \t(\n \t\tcd downstream &&\n \t\tgit config -f .gitmodules submodule.submodule.fetchRecurseSubmodules true &&\n@@ -141,7 +141,7 @@ test_expect_success \"using fetchRecurseSubmodules=false in .git/config overrides\n \ttest_must_be_empty actual.err\n '\n \n-test_expect_success \"--recurse-submodules overrides fetchRecurseSubmodules setting from .git/config\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"--recurse-submodules overrides fetchRecurseSubmodules setting from .git/config\" '\n \t(\n \t\tcd downstream &&\n \t\tgit fetch --recurse-submodules >../actual.out 2>../actual.err &&\n@@ -170,7 +170,7 @@ test_expect_success \"--quiet propagates to parallel submodules\" '\n \ttest_must_be_empty actual.err\n '\n \n-test_expect_success \"--dry-run propagates to submodules\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"--dry-run propagates to submodules\" '\n \tadd_upstream_commit &&\n \t(\n \t\tcd downstream &&\n@@ -180,7 +180,7 @@ test_expect_success \"--dry-run propagates to submodules\" '\n \ttest_i18ncmp expect.err actual.err\n '\n \n-test_expect_success \"Without --dry-run propagates to submodules\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"Without --dry-run propagates to submodules\" '\n \t(\n \t\tcd downstream &&\n \t\tgit fetch --recurse-submodules >../actual.out 2>../actual.err\n@@ -189,7 +189,7 @@ test_expect_success \"Without --dry-run propagates to submodules\" '\n \ttest_i18ncmp expect.err actual.err\n '\n \n-test_expect_success \"recurseSubmodules=true propagates into submodules\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"recurseSubmodules=true propagates into submodules\" '\n \tadd_upstream_commit &&\n \t(\n \t\tcd downstream &&\n@@ -200,7 +200,7 @@ test_expect_success \"recurseSubmodules=true propagates into submodules\" '\n \ttest_i18ncmp expect.err actual.err\n '\n \n-test_expect_success \"--recurse-submodules overrides config in submodule\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"--recurse-submodules overrides config in submodule\" '\n \tadd_upstream_commit &&\n \t(\n \t\tcd downstream &&\n@@ -225,7 +225,7 @@ test_expect_success \"--no-recurse-submodules overrides config setting\" '\n \ttest_must_be_empty actual.err\n '\n \n-test_expect_success \"Recursion doesn't happen when no new commits are fetched in the superproject\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"Recursion doesn't happen when no new commits are fetched in the superproject\" '\n \t(\n \t\tcd downstream &&\n \t\t(\n@@ -239,13 +239,13 @@ test_expect_success \"Recursion doesn't happen when no new commits are fetched in\n \ttest_must_be_empty actual.err\n '\n \n-test_expect_success \"Recursion stops when no new submodule commits are fetched\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"Recursion stops when no new submodule commits are fetched\" '\n \thead1=$(git rev-parse --short HEAD) &&\n \tgit add submodule &&\n \tgit commit -m \"new submodule\" &&\n \thead2=$(git rev-parse --short HEAD) &&\n \techo \"From $pwd/.\" > expect.err.sub &&\n-\techo \" $head1..$head2 master -> origin/master\" >>expect.err.sub &&\n+\techo \" $head1..$head2 main -> origin/main\" >>expect.err.sub &&\n \thead -3 expect.err >> expect.err.sub &&\n \t(\n \t\tcd downstream &&\n@@ -255,7 +255,7 @@ test_expect_success \"Recursion stops when no new submodule commits are fetched\"\n \ttest_must_be_empty actual.out\n '\n \n-test_expect_success \"Recursion doesn't happen when new superproject commits don't change any submodules\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"Recursion doesn't happen when new superproject commits don't change any submodules\" '\n \tadd_upstream_commit &&\n \thead1=$(git rev-parse --short HEAD) &&\n \techo a > file &&\n@@ -263,7 +263,7 @@ test_expect_success \"Recursion doesn't happen when new superproject commits don'\n \tgit commit -m \"new file\" &&\n \thead2=$(git rev-parse --short HEAD) &&\n \techo \"From $pwd/.\" > expect.err.file &&\n-\techo \" $head1..$head2 master -> origin/master\" >> expect.err.file &&\n+\techo \" $head1..$head2 main -> origin/main\" >> expect.err.file &&\n \t(\n \t\tcd downstream &&\n \t\tgit fetch >../actual.out 2>../actual.err\n@@ -272,7 +272,7 @@ test_expect_success \"Recursion doesn't happen when new superproject commits don'\n \ttest_i18ncmp expect.err.file actual.err\n '\n \n-test_expect_success \"Recursion picks up config in submodule\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"Recursion picks up config in submodule\" '\n \t(\n \t\tcd downstream &&\n \t\tgit fetch --recurse-submodules &&\n@@ -287,7 +287,7 @@ test_expect_success \"Recursion picks up config in submodule\" '\n \tgit commit -m \"new submodule\" &&\n \thead2=$(git rev-parse --short HEAD) &&\n \techo \"From $pwd/.\" > expect.err.sub &&\n-\techo \" $head1..$head2 master -> origin/master\" >> expect.err.sub &&\n+\techo \" $head1..$head2 main -> origin/main\" >> expect.err.sub &&\n \tcat expect.err >> expect.err.sub &&\n \t(\n \t\tcd downstream &&\n@@ -301,7 +301,7 @@ test_expect_success \"Recursion picks up config in submodule\" '\n \ttest_must_be_empty actual.out\n '\n \n-test_expect_success \"Recursion picks up all submodules when necessary\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"Recursion picks up all submodules when necessary\" '\n \tadd_upstream_commit &&\n \t(\n \t\tcd submodule &&\n@@ -316,14 +316,14 @@ test_expect_success \"Recursion picks up all submodules when necessary\" '\n \t\thead2=$(git rev-parse --short HEAD) &&\n \t\techo \"Fetching submodule submodule\" > ../expect.err.sub &&\n \t\techo \"From $pwd/submodule\" >> ../expect.err.sub &&\n-\t\techo \" $head1..$head2 master -> origin/master\" >> ../expect.err.sub\n+\t\techo \" $head1..$head2 main -> origin/main\" >> ../expect.err.sub\n \t) &&\n \thead1=$(git rev-parse --short HEAD) &&\n \tgit add submodule &&\n \tgit commit -m \"new submodule\" &&\n \thead2=$(git rev-parse --short HEAD) &&\n \techo \"From $pwd/.\" > expect.err.2 &&\n-\techo \" $head1..$head2 master -> origin/master\" >> expect.err.2 &&\n+\techo \" $head1..$head2 main -> origin/main\" >> expect.err.2 &&\n \tcat expect.err.sub >> expect.err.2 &&\n \ttail -3 expect.err >> expect.err.2 &&\n \t(\n@@ -334,7 +334,7 @@ test_expect_success \"Recursion picks up all submodules when necessary\" '\n \ttest_must_be_empty actual.out\n '\n \n-test_expect_success \"'--recurse-submodules=on-demand' doesn't recurse when no new commits are fetched in the superproject (and ignores config)\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"'--recurse-submodules=on-demand' doesn't recurse when no new commits are fetched in the superproject (and ignores config)\" '\n \tadd_upstream_commit &&\n \t(\n \t\tcd submodule &&\n@@ -349,7 +349,7 @@ test_expect_success \"'--recurse-submodules=on-demand' doesn't recurse when no ne\n \t\thead2=$(git rev-parse --short HEAD) &&\n \t\techo Fetching submodule submodule > ../expect.err.sub &&\n \t\techo \"From $pwd/submodule\" >> ../expect.err.sub &&\n-\t\techo \" $head1..$head2 master -> origin/master\" >> ../expect.err.sub\n+\t\techo \" $head1..$head2 main -> origin/main\" >> ../expect.err.sub\n \t) &&\n \t(\n \t\tcd downstream &&\n@@ -361,14 +361,14 @@ test_expect_success \"'--recurse-submodules=on-demand' doesn't recurse when no ne\n \ttest_must_be_empty actual.err\n '\n \n-test_expect_success \"'--recurse-submodules=on-demand' recurses as deep as necessary (and ignores config)\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"'--recurse-submodules=on-demand' recurses as deep as necessary (and ignores config)\" '\n \thead1=$(git rev-parse --short HEAD) &&\n \tgit add submodule &&\n \tgit commit -m \"new submodule\" &&\n \thead2=$(git rev-parse --short HEAD) &&\n \ttail -3 expect.err > expect.err.deepsub &&\n \techo \"From $pwd/.\" > expect.err &&\n-\techo \" $head1..$head2 master -> origin/master\" >>expect.err &&\n+\techo \" $head1..$head2 main -> origin/main\" >>expect.err &&\n \tcat expect.err.sub >> expect.err &&\n \tcat expect.err.deepsub >> expect.err &&\n \t(\n@@ -389,7 +389,7 @@ test_expect_success \"'--recurse-submodules=on-demand' recurses as deep as necess\n \ttest_i18ncmp expect.err actual.err\n '\n \n-test_expect_success \"'--recurse-submodules=on-demand' stops when no new submodule commits are found in the superproject (and ignores config)\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"'--recurse-submodules=on-demand' stops when no new submodule commits are found in the superproject (and ignores config)\" '\n \tadd_upstream_commit &&\n \thead1=$(git rev-parse --short HEAD) &&\n \techo a >> file &&\n@@ -397,7 +397,7 @@ test_expect_success \"'--recurse-submodules=on-demand' stops when no new submodul\n \tgit commit -m \"new file\" &&\n \thead2=$(git rev-parse --short HEAD) &&\n \techo \"From $pwd/.\" > expect.err.file &&\n-\techo \" $head1..$head2 master -> origin/master\" >> expect.err.file &&\n+\techo \" $head1..$head2 main -> origin/main\" >> expect.err.file &&\n \t(\n \t\tcd downstream &&\n \t\tgit fetch --recurse-submodules=on-demand >../actual.out 2>../actual.err\n@@ -406,7 +406,7 @@ test_expect_success \"'--recurse-submodules=on-demand' stops when no new submodul\n \ttest_i18ncmp expect.err.file actual.err\n '\n \n-test_expect_success \"'fetch.recurseSubmodules=on-demand' overrides global config\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"'fetch.recurseSubmodules=on-demand' overrides global config\" '\n \t(\n \t\tcd downstream &&\n \t\tgit fetch --recurse-submodules\n@@ -418,7 +418,7 @@ test_expect_success \"'fetch.recurseSubmodules=on-demand' overrides global config\n \tgit commit -m \"new submodule\" &&\n \thead2=$(git rev-parse --short HEAD) &&\n \techo \"From $pwd/.\" > expect.err.2 &&\n-\techo \" $head1..$head2 master -> origin/master\" >>expect.err.2 &&\n+\techo \" $head1..$head2 main -> origin/main\" >>expect.err.2 &&\n \thead -3 expect.err >> expect.err.2 &&\n \t(\n \t\tcd downstream &&\n@@ -434,7 +434,7 @@ test_expect_success \"'fetch.recurseSubmodules=on-demand' overrides global config\n \ttest_i18ncmp expect.err.2 actual.err\n '\n \n-test_expect_success \"'submodule..fetchRecurseSubmodules=on-demand' overrides fetch.recurseSubmodules\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"'submodule..fetchRecurseSubmodules=on-demand' overrides fetch.recurseSubmodules\" '\n \t(\n \t\tcd downstream &&\n \t\tgit fetch --recurse-submodules\n@@ -446,7 +446,7 @@ test_expect_success \"'submodule..fetchRecurseSubmodules=on-demand' override\n \tgit commit -m \"new submodule\" &&\n \thead2=$(git rev-parse --short HEAD) &&\n \techo \"From $pwd/.\" > expect.err.2 &&\n-\techo \" $head1..$head2 master -> origin/master\" >>expect.err.2 &&\n+\techo \" $head1..$head2 main -> origin/main\" >>expect.err.2 &&\n \thead -3 expect.err >> expect.err.2 &&\n \t(\n \t\tcd downstream &&\n@@ -462,7 +462,7 @@ test_expect_success \"'submodule..fetchRecurseSubmodules=on-demand' override\n \ttest_i18ncmp expect.err.2 actual.err\n '\n \n-test_expect_success \"don't fetch submodule when newly recorded commits are already present\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"don't fetch submodule when newly recorded commits are already present\" '\n \t(\n \t\tcd submodule &&\n \t\tgit checkout -q HEAD^^\n@@ -472,7 +472,7 @@ test_expect_success \"don't fetch submodule when newly recorded commits are alrea\n \tgit commit -m \"submodule rewound\" &&\n \thead2=$(git rev-parse --short HEAD) &&\n \techo \"From $pwd/.\" > expect.err &&\n-\techo \" $head1..$head2 master -> origin/master\" >> expect.err &&\n+\techo \" $head1..$head2 main -> origin/main\" >> expect.err &&\n \t(\n \t\tcd downstream &&\n \t\tgit fetch >../actual.out 2>../actual.err\n@@ -485,7 +485,7 @@ test_expect_success \"don't fetch submodule when newly recorded commits are alrea\n \t)\n '\n \n-test_expect_success \"'fetch.recurseSubmodules=on-demand' works also without .gitmodules entry\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"'fetch.recurseSubmodules=on-demand' works also without .gitmodules entry\" '\n \t(\n \t\tcd downstream &&\n \t\tgit fetch --recurse-submodules\n@@ -497,7 +497,7 @@ test_expect_success \"'fetch.recurseSubmodules=on-demand' works also without .git\n \tgit commit -m \"new submodule without .gitmodules\" &&\n \thead2=$(git rev-parse --short HEAD) &&\n \techo \"From $pwd/.\" >expect.err.2 &&\n-\techo \" $head1..$head2 master -> origin/master\" >>expect.err.2 &&\n+\techo \" $head1..$head2 main -> origin/main\" >>expect.err.2 &&\n \thead -3 expect.err >>expect.err.2 &&\n \t(\n \t\tcd downstream &&\ndiff --git a/t/t6302-for-each-ref-filter.sh b/t/t6302-for-each-ref-filter.sh\nindex 781e470aea..0a21669f56 100755\n--- a/t/t6302-for-each-ref-filter.sh\n+++ b/t/t6302-for-each-ref-filter.sh\n@@ -113,9 +113,9 @@ test_expect_success '%(color) must fail' '\n \ttest_must_fail git for-each-ref --format=\"%(color)%(refname)\"\n '\n \n-test_expect_success 'left alignment is default' '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH 'left alignment is default' '\n \tcat >expect <<-\\EOF &&\n-\trefname is refs/heads/master |refs/heads/master\n+\trefname is refs/heads/main |refs/heads/main\n \trefname is refs/heads/side |refs/heads/side\n \trefname is refs/odd/spot |refs/odd/spot\n \trefname is refs/tags/annotated-tag|refs/tags/annotated-tag\n@@ -131,9 +131,9 @@ test_expect_success 'left alignment is default' '\n \ttest_cmp expect actual\n '\n \n-test_expect_success 'middle alignment' '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH 'middle alignment' '\n \tcat >expect <<-\\EOF &&\n-\t| refname is refs/heads/master |refs/heads/master\n+\t| refname is refs/heads/main |refs/heads/main\n \t| refname is refs/heads/side |refs/heads/side\n \t| refname is refs/odd/spot |refs/odd/spot\n \t|refname is refs/tags/annotated-tag|refs/tags/annotated-tag\n@@ -149,9 +149,9 @@ test_expect_success 'middle alignment' '\n \ttest_cmp expect actual\n '\n \n-test_expect_success 'right alignment' '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH 'right alignment' '\n \tcat >expect <<-\\EOF &&\n-\t| refname is refs/heads/master|refs/heads/master\n+\t| refname is refs/heads/main|refs/heads/main\n \t| refname is refs/heads/side|refs/heads/side\n \t| refname is refs/odd/spot|refs/odd/spot\n \t|refname is refs/tags/annotated-tag|refs/tags/annotated-tag\n@@ -168,7 +168,7 @@ test_expect_success 'right alignment' '\n '\n \n cat >expect <<-\\EOF\n-| refname is refs/heads/master |refs/heads/master\n+| refname is refs/heads/main |refs/heads/main\n | refname is refs/heads/side |refs/heads/side\n | refname is refs/odd/spot |refs/odd/spot\n | refname is refs/tags/annotated-tag |refs/tags/annotated-tag\n@@ -184,7 +184,7 @@ EOF\n test_align_permutations() {\n \twhile read -r option\n \tdo\n-\t\ttest_expect_success \"align:$option\" '\n+\t\ttest_expect_success PREPARE_FOR_MAIN_BRANCH \"align:$option\" '\n \t\t\tgit for-each-ref --format=\"|%(align:$option)refname is %(refname)%(end)|%(refname)\" >actual &&\n \t\t\ttest_cmp expect actual\n \t\t'\n@@ -213,9 +213,9 @@ EOF\n \n # Individual atoms inside %(align:...) and %(end) must not be quoted.\n \n-test_expect_success 'alignment with format quote' \"\n+test_expect_success PREPARE_FOR_MAIN_BRANCH 'alignment with format quote' \"\n \tcat >expect <<-\\EOF &&\n-\t|' '\\''master| A U Thor'\\'' '|\n+\t|' '\\''main| A U Thor'\\'' '|\n \t|' '\\''side| A U Thor'\\'' '|\n \t|' '\\''odd/spot| A U Thor'\\'' '|\n \t|' '\\''annotated-tag| '\\'' '|\n@@ -231,9 +231,9 @@ test_expect_success 'alignment with format quote' \"\n \ttest_cmp expect actual\n \"\n \n-test_expect_success 'nested alignment with quote formatting' \"\n+test_expect_success PREPARE_FOR_MAIN_BRANCH 'nested alignment with quote formatting' \"\n \tcat >expect <<-\\EOF &&\n-\t|' master '|\n+\t|' main '|\n \t|' side '|\n \t|' odd/spot '|\n \t|' annotated-tag '|\n-- \ngitgitgadget\n\n"},{"id":"407902","messageId":"1641d1950d01cc565ee54c9d642bd7079056b5c0.1603135903.git.gitgitgadget@gmail.com","threadId":"54464","inReplyTo":"pull.758.git.1603135902.gitgitgadget@gmail.com","subject":"[PATCH 08/10] t9902: prepare a test for the upcoming default branch name","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-10-19T19:31:39Z","receivedAt":"2020-10-19T19:32:01Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nWe need to adjust a test that uses a prefix of the default branch name,\nto accommodate for `main` being used soon.\n\nSigned-off-by: Johannes Schindelin \n---\n t/t9902-completion.sh | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/t/t9902-completion.sh b/t/t9902-completion.sh\nindex 7b7bc6e4bd..0badcf829b 100755\n--- a/t/t9902-completion.sh\n+++ b/t/t9902-completion.sh\n@@ -1055,13 +1055,13 @@ test_expect_success 'teardown after filtering matching refs' '\n \tgit -C otherrepo branch -D matching/branch-in-other\n '\n \n-test_expect_success '__git_refs - for-each-ref format specifiers in prefix' '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH '__git_refs - for-each-ref format specifiers in prefix' '\n \tcat >expected <<-EOF &&\n \tevil-%%-%42-%(refname)..master\n \tEOF\n \t(\n-\t\tcur=\"evil-%%-%42-%(refname)..mas\" &&\n-\t\t__git_refs \"\" \"\" \"evil-%%-%42-%(refname)..\" mas >\"$actual\"\n+\t\tcur=\"evil-%%-%42-%(refname)..mai\" &&\n+\t\t__git_refs \"\" \"\" \"evil-%%-%42-%(refname)..\" mai >\"$actual\"\n \t) &&\n \ttest_cmp expected \"$actual\"\n '\n-- \ngitgitgadget\n\n"},{"id":"407903","messageId":"66365bce55d6d64d1a67851955a302fcc899d12c.1603135903.git.gitgitgadget@gmail.com","threadId":"54464","inReplyTo":"pull.758.git.1603135902.gitgitgadget@gmail.com","subject":"[PATCH 10/10] t1400: prepare for `main` being default branch name","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-10-19T19:31:41Z","receivedAt":"2020-10-19T19:32:01Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nIn addition to the trivial search-and-replace, there are three\nnon-trivial adjustments necessary.\n\nMark the respective test cases with the transitional prereq and make\nthose non-trivial adjustments early, to make this change easier to\nreview.\n\nSigned-off-by: Johannes Schindelin \n---\n t/t1400-update-ref.sh | 10 +++++-----\n 1 file changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh\nindex 770e7be363..4c01e08551 100755\n--- a/t/t1400-update-ref.sh\n+++ b/t/t1400-update-ref.sh\n@@ -585,10 +585,10 @@ test_expect_success 'stdin fails on unbalanced quotes' '\n \tgrep \"fatal: badly quoted argument: \\\\\\\"master\" err\n '\n \n-test_expect_success 'stdin fails on invalid escape' '\n-\techo \"create $a \\\"ma\\zter\\\"\" >stdin &&\n+test_expect_success PREPARE_FOR_MAIN_BRANCH 'stdin fails on invalid escape' '\n+\techo \"create $a \\\"ma\\zn\\\"\" >stdin &&\n \ttest_must_fail git update-ref --stdin err &&\n-\tgrep \"fatal: badly quoted argument: \\\\\\\"ma\\\\\\\\zter\\\\\\\"\" err\n+\tgrep \"fatal: badly quoted argument: \\\\\\\"ma\\\\\\\\zn\\\\\\\"\" err\n '\n \n test_expect_success 'stdin fails on junk after quoted argument' '\n@@ -704,9 +704,9 @@ test_expect_success 'stdin succeeds with quoted argument' '\n \ttest_cmp expect actual\n '\n \n-test_expect_success 'stdin succeeds with escaped character' '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH 'stdin succeeds with escaped character' '\n \tgit update-ref -d $a &&\n-\techo \"create $a \\\"ma\\\\163ter\\\"\" >stdin &&\n+\techo \"create $a \\\"ma\\\\151n\\\"\" >stdin &&\n \tgit update-ref --stdin expect &&\n \tgit rev-parse $a >actual &&\n-- \ngitgitgadget\n"},{"id":"408109","messageId":"xmqqblgv5jfk.fsf@gitster.c.googlers.com","threadId":"54464","inReplyTo":"pull.758.git.1603135902.gitgitgadget@gmail.com","subject":"Re: [PATCH 00/10] Prepare for changing the default branch name main (last manual part)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-10-21T21:59:59Z","receivedAt":"2020-10-21T22:00:04Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Johannes Schindelin via GitGitGadget\" \nwrites:\n\n> In preparation for changing the default of init.defaultBranch to main, here\n> are a couple of manual adjustments that cannot be automated (i.e., these\n> adjustments are not mere search-and-replaces).\n>\n> This patch series is based on js/default-branch-name-part-3, and is part of\n> the larger effort tracked at https://github.com/gitgitgadget/git/pull/655.\n>\n> The next patch series will be largely automated search-and-replaces;\n> Obviously, the search-and-replace was the easy part, the manual inspection\n> whether the changes are actually correct was much more involved.\n\nYes. That's always the pain-point of a tree-wide change like this.\n\n> What to expect next, after this patch series? Essentially, there is the\n> large patch series that adjusts the entire test suite, with two patch series\n> extracted from that effort: t5411 and t5515 simply require too large\n> patches, and will therefore be presented as the next patch series after this\n> one.\n\nThis one is already a bit too ambitious in that it collides with\nstuff in flight, by the way.\n\n"},{"id":"408111","messageId":"xmqq7drj5iux.fsf@gitster.c.googlers.com","threadId":"54464","inReplyTo":"cf950c6f6a48f9a6ad55ac027afbc0640f9a535d.1603135902.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 01/10] fmt-merge-msg: also suppress \"into main\" by default","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-10-21T22:12:22Z","receivedAt":"2020-10-21T22:12:30Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Johannes Schindelin via GitGitGadget\" \nwrites:\n\n> From: Johannes Schindelin \n>\n> In preparation for changing the default branch name to `main`, let's\n> skip the suffix \"into main\" in merge commit messages.\n\nHmph, we reversed the course from \"no suppression\" to \"suppress\nmaster as we've always done\" because otherwise we'd add _more_\ninstances of 6-letter string 'master' to our codebase, and that\nwas to be avoided. There is no such \"let's avoid saying main\"\ndesire, is there?\n\nI can see why a series about updating tests would want a change like\nthis (i.e. to avoid patches that have to add 'into main' everywhere\nto the expected output), but as to the desired behaviour of the\ndefault behaviour of \"git merge\" command, I am not sure this goes\ninto the right direction. After all, there are those (including me)\nwho find the idea of having one single thing (in this case a branch)\nthat is special among others is objectionable in itself, not what\nword (e.g. 'master') is used to call that single \"special\" thing.\n\nHaving said all that, let me keep my suggested change to the very\nminimum. Let's end the proposed log message with\n\n ..., let's skip the suffix \"into main\" in merge commit messages,\n the same way that \"into master\" has been skipped by default.\n\nThat would justify why we are still special casing the new word.\n\nThanks.\n\n> Signed-off-by: Johannes Schindelin \n> ---\n> fmt-merge-msg.c | 4 +++-\n> 1 file changed, 3 insertions(+), 1 deletion(-)\n>\n> diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c\n> index bd22e1ea88..9a664a4a58 100644\n> --- a/fmt-merge-msg.c\n> +++ b/fmt-merge-msg.c\n> @@ -626,8 +626,10 @@ int fmt_merge_msg(struct strbuf *in, struct strbuf *out,\n> \tvoid *current_branch_to_free;\n> \tstruct merge_parents merge_parents;\n> \n> -\tif (!suppress_dest_pattern_seen)\n> +\tif (!suppress_dest_pattern_seen) {\n> +\t\tstring_list_append(&suppress_dest_patterns, \"main\");\n> \t\tstring_list_append(&suppress_dest_patterns, \"master\");\n> +\t}\n> \n> \tmemset(&merge_parents, 0, sizeof(merge_parents));\n"},{"id":"408112","messageId":"xmqq36275ij5.fsf@gitster.c.googlers.com","threadId":"54464","inReplyTo":"5849eda331e09732026f0432cf1040a4e973a702.1603135902.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 02/10] t9801: use `--` in preparation for default branch rename","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-10-21T22:19:26Z","receivedAt":"2020-10-21T22:19:34Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Johannes Schindelin via GitGitGadget\" \nwrites:\n\n> From: Johannes Schindelin \n>\n> Seeing as we want to use `main` as the new default branch name used by\n> `git init`, and that `main` is used as directory name in t9801, let's\n> tighten the rev-list arguments to make it explicit when we are referring\n> to a ref instead of a directory.\n\nInteresting. s/master/main/g would introduce \"that name is both a\nrevision and a path\" ambiguity? An obvious alternative would be to\nuse a word that is not 'main' or 'master' for the path and that way\nwe will keep the current property that tests do not have to worry\nabout the rev/path ambiguity. But given that even \"git p4\" should\nbe safe against rev/path ambiguity, I think this is good in the long\nrun---if \"git p4\" is not prepared to handle the ambiguity correctly,\nthen this approach may reveal such an existing breakage when the\nbranch name 'master' is replaced with 'main', and at that point, we\nhave to scramble and fix it (or rename the path from 'main' to\nsomething else as a workaround).\n\nLooking good.\n\n"},{"id":"408115","messageId":"xmqqy2jz43tm.fsf@gitster.c.googlers.com","threadId":"54464","inReplyTo":"d9469202c2dda238882150452fac1aa7fc7fbfec.1603135902.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 03/10] tests: start moving to a different default main branch name","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-10-21T22:22:29Z","receivedAt":"2020-10-21T22:22:35Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Johannes Schindelin via GitGitGadget\" \nwrites:\n\n> Note: the `GIT_TEST_DEFAULT_MAIN_BRANCH_NAME` is _not_ intended to be\n> used manually; many tests require a specific main branch name and cannot\n> simply work with another one. This `GIT_TEST_*` variable is meant purely\n> for the transitional period while the entire test suite is converted to\n> use `main` as the initial branch name by default.\n>\n> We also introduce the `PREPARE_FOR_MAIN_BRANCH` prereq that determines\n> whether the default main branch name is `main`, and adjust a couple of\n> test functions to use it. This prereq will be used to temporarily\n> disable a couple test cases to allow for adjusting the test script\n> incrementally. Once an entire test is adjusted, we will adjust the test\n> so that it is run with `GIT_TEST_DEFAULT_MAIN_BRANCH_NAME=main`.\n\nGood transition plan. The name of the environment variable itself\nserves as markers that remind us where we need to update once the\nconversion is done, so there is no need to leave NEEDSWORK comment,\neither.\n\nNicely done.\n\n"},{"id":"408116","messageId":"xmqqtuun43ri.fsf@gitster.c.googlers.com","threadId":"54464","inReplyTo":"baeb01f70646ce0c7564f1a1f820fb011e124d97.1603135902.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 04/10] t4013: prepare for the new default branch name \"main\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-10-21T22:23:45Z","receivedAt":"2020-10-21T22:23:53Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Johannes Schindelin via GitGitGadget\" \nwrites:\n\n> From: Johannes Schindelin \n>\n> This patch is a bit involved, mainly because the default branch name is\n> not only hard-coded in the script `t4013-diff-various.sh` itself, and\n> not only in the support files in `t/t4013/`, but also in the _file\n> names_ in `t/t4013/`.\n\nThere are some stuff in flight; let's hold this step before they\ngraduate to avoid clashing.\n"},{"id":"408117","messageId":"xmqqpn5b43lv.fsf@gitster.c.googlers.com","threadId":"54464","inReplyTo":"7860d8d7df43075ad5424d8210d6f6e17c2042db.1603135903.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 05/10] t6200: adjust suppression pattern to also match \"main\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-10-21T22:27:08Z","receivedAt":"2020-10-21T22:27:13Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Johannes Schindelin via GitGitGadget\" \nwrites:\n\n> -\tgit -c merge.suppressDest=\"ma??er\" fmt-merge-msg <.git/FETCH_HEAD >full.3 &&\n> +\tgit -c merge.suppressDest=\"ma*\" fmt-merge-msg <.git/FETCH_HEAD >full.3 &&\n\nCute. IIRC, the point of this test was to ensure that a glob\npattern works, so we can do a bit better to avoid colliding with\nanother common name 'maint' by tightening the pattern to something\nlike \"ma?*[rn]\".\n\n"},{"id":"408119","messageId":"xmqqlffz439g.fsf@gitster.c.googlers.com","threadId":"54464","inReplyTo":"0d2511d18fb2908b1049afe4da7494f6ed7e26e8.1603135903.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 06/10] t5703: adjust a test case for the upcoming default branch name","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-10-21T22:34:35Z","receivedAt":"2020-10-21T22:34:47Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Johannes Schindelin via GitGitGadget\" \nwrites:\n\n> From: Johannes Schindelin \n>\n> We want to rename the default branch name used by `git init` in the near\n> future, using `main` as the new name.\n>\n> In preparation for that, we adjust a test case that wants to rename the\n> default branch to a different name that however has the same length. We\n> use `none` as that name because it matches the length of `main`.\n\nThe original chose word that not only is the same length but is\nsimilarly spell (master vs raster). Perhaps mirroring that\narrangement and picking 'rain' would have been even a better taste,\nbut this is good enough ;-)\n\nThe test pieces in this script seem to be arranged to be mostly\nindependent from each other, and especially because this one is at\nthe end of the script, making it run only when 'main' is in use,\nand skipping otherwise, would not hurt anybody else. We just need\nto make sure that nobody adds new tests after this one that may be\naffected by the allowRefInWant configuration setting.\n\nLooking good.\n\nThanks.\n\n> -test_expect_success 'server loses a ref - ref in want' '\n> +test_expect_success PREPARE_FOR_MAIN_BRANCH 'server loses a ref - ref in want' '\n> \tgit -C \"$REPO\" config uploadpack.allowRefInWant true &&\n> \trm -rf local &&\n> \tcp -r \"$LOCAL_PRISTINE\" local &&\n> -\techo \"s/master/raster/\" >\"$HTTPD_ROOT_PATH/one-time-perl\" &&\n> +\techo \"s/main/none/\" >\"$HTTPD_ROOT_PATH/one-time-perl\" &&\n> \ttest_must_fail git -C local fetch 2>err &&\n> \n> -\ttest_i18ngrep \"fatal: remote error: unknown ref refs/heads/raster\" err\n> +\ttest_i18ngrep \"fatal: remote error: unknown ref refs/heads/none\" err\n> '\n> \n> # DO NOT add non-httpd-specific tests here, because the last part of this\n"},{"id":"408120","messageId":"xmqqh7qn431p.fsf@gitster.c.googlers.com","threadId":"54464","inReplyTo":"e1740bb7d7d8c90db68ffff443b69894177e36f3.1603135903.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 07/10] t3200: prepare for `main` being shorter than `master`","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-10-21T22:39:14Z","receivedAt":"2020-10-21T22:39:25Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Johannes Schindelin via GitGitGadget\" \nwrites:\n\n> From: Johannes Schindelin \n>\n> In the test case adjusted by this patch, we want to cut just after the\n> longest shown ref name. Since `main` is shorter than `master`, we need\n> to decrease the number of characters. Since `main2` is shown, too, and\n> since that is only one character shorter than `master`, we decrement the\n> length by one.\n\nConfused. I do not see 'main2' (or 'master2' for that matter) in\nthe test script.\n\nIf we rename 'topic' to 'topico', then we'd still show branches, the\nlongest among which has 6 characters (the same as 'master'), so we\nwon't have to wonder where 'main2' came from; I guess that is another\nway to solve this.\n\n\n\n>\n> Signed-off-by: Johannes Schindelin \n> ---\n> t/t3200-branch.sh | 4 ++--\n> 1 file changed, 2 insertions(+), 2 deletions(-)\n>\n> diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh\n> index 6efe7a44bc..55b24b76ce 100755\n> --- a/t/t3200-branch.sh\n> +++ b/t/t3200-branch.sh\n> @@ -375,9 +375,9 @@ test_expect_success 'git branch --column -v should fail' '\n> \ttest_must_fail git branch --column -v\n> '\n> \n> -test_expect_success 'git branch -v with column.ui ignored' '\n> +test_expect_success PREPARE_FOR_MAIN_BRANCH 'git branch -v with column.ui ignored' '\n> \tgit config column.ui column &&\n> -\tCOLUMNS=80 git branch -v | cut -c -9 | sed \"s/ *$//\" >actual &&\n> +\tCOLUMNS=80 git branch -v | cut -c -8 | sed \"s/ *$//\" >actual &&\n> \tgit config --unset column.ui &&\n> \tcat >expect <<\\EOF &&\n> a/b/c\n"},{"id":"408165","messageId":"nycvar.QRO.7.76.6.2010221425380.56@tvgsbejvaqbjf.bet","threadId":"54464","inReplyTo":"xmqqtuun43ri.fsf@gitster.c.googlers.com","subject":"Re: [PATCH 04/10] t4013: prepare for the new default branch name \"main\"","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2020-10-22T12:27:31Z","receivedAt":"2020-10-22T12:27:36Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Wed, 21 Oct 2020, Junio C Hamano wrote:\n\n> \"Johannes Schindelin via GitGitGadget\" \n> writes:\n>\n> > From: Johannes Schindelin \n> >\n> > This patch is a bit involved, mainly because the default branch name is\n> > not only hard-coded in the script `t4013-diff-various.sh` itself, and\n> > not only in the support files in `t/t4013/`, but also in the _file\n> > names_ in `t/t4013/`.\n>\n> There are some stuff in flight; let's hold this step before they\n> graduate to avoid clashing.\n\nFair enough. I described the commands I ran to bring this patch about, and\nI can just as easily run the same commands once the dust settled a bit.\n\nThanks,\nDscho\n"},{"id":"408166","messageId":"nycvar.QRO.7.76.6.2010221427560.56@tvgsbejvaqbjf.bet","threadId":"54464","inReplyTo":"xmqq7drj5iux.fsf@gitster.c.googlers.com","subject":"Re: [PATCH 01/10] fmt-merge-msg: also suppress \"into main\" by default","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2020-10-22T12:28:52Z","receivedAt":"2020-10-22T12:28:59Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Wed, 21 Oct 2020, Junio C Hamano wrote:\n\n> \"Johannes Schindelin via GitGitGadget\" \n> writes:\n>\n> > From: Johannes Schindelin \n> >\n> > In preparation for changing the default branch name to `main`, let's\n> > skip the suffix \"into main\" in merge commit messages.\n>\n> Hmph, we reversed the course from \"no suppression\" to \"suppress\n> master as we've always done\" because otherwise we'd add _more_\n> instances of 6-letter string 'master' to our codebase, and that\n> was to be avoided. There is no such \"let's avoid saying main\"\n> desire, is there?\n>\n> I can see why a series about updating tests would want a change like\n> this (i.e. to avoid patches that have to add 'into main' everywhere\n> to the expected output), but as to the desired behaviour of the\n> default behaviour of \"git merge\" command, I am not sure this goes\n> into the right direction. After all, there are those (including me)\n> who find the idea of having one single thing (in this case a branch)\n> that is special among others is objectionable in itself, not what\n> word (e.g. 'master') is used to call that single \"special\" thing.\n\nThe reason I did it this way is to benefit from a straight-forward\n`s/master/main/g`...\n\n> Having said all that, let me keep my suggested change to the very\n> minimum. Let's end the proposed log message with\n>\n> ..., let's skip the suffix \"into main\" in merge commit messages,\n> the same way that \"into master\" has been skipped by default.\n>\n> That would justify why we are still special casing the new word.\n\nI changed it this way.\n\nThanks,\nDscho\n"},{"id":"408167","messageId":"nycvar.QRO.7.76.6.2010221501250.56@tvgsbejvaqbjf.bet","threadId":"54464","inReplyTo":"xmqqpn5b43lv.fsf@gitster.c.googlers.com","subject":"Re: [PATCH 05/10] t6200: adjust suppression pattern to also match \"main\"","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2020-10-22T13:01:44Z","receivedAt":"2020-10-22T13:01:52Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Wed, 21 Oct 2020, Junio C Hamano wrote:\n\n> \"Johannes Schindelin via GitGitGadget\" \n> writes:\n>\n> > -\tgit -c merge.suppressDest=\"ma??er\" fmt-merge-msg <.git/FETCH_HEAD >full.3 &&\n> > +\tgit -c merge.suppressDest=\"ma*\" fmt-merge-msg <.git/FETCH_HEAD >full.3 &&\n>\n> Cute. IIRC, the point of this test was to ensure that a glob\n> pattern works, so we can do a bit better to avoid colliding with\n> another common name 'maint' by tightening the pattern to something\n> like \"ma?*[rn]\".\n\nGood idea. I changed it locally.\n\nCiao,\nDscho\n"},{"id":"408168","messageId":"nycvar.QRO.7.76.6.2010221505320.56@tvgsbejvaqbjf.bet","threadId":"54464","inReplyTo":"xmqqh7qn431p.fsf@gitster.c.googlers.com","subject":"Re: [PATCH 07/10] t3200: prepare for `main` being shorter than `master`","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2020-10-22T13:08:51Z","receivedAt":"2020-10-22T13:08:59Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Wed, 21 Oct 2020, Junio C Hamano wrote:\n\n> \"Johannes Schindelin via GitGitGadget\" \n> writes:\n>\n> > From: Johannes Schindelin \n> >\n> > In the test case adjusted by this patch, we want to cut just after the\n> > longest shown ref name. Since `main` is shorter than `master`, we need\n> > to decrease the number of characters. Since `main2` is shown, too, and\n> > since that is only one character shorter than `master`, we decrement the\n> > length by one.\n>\n> Confused. I do not see 'main2' (or 'master2' for that matter) in\n> the test script.\n\nOops. Yes, this is a left-over from the time when I had renamed the\nbranches from `master2` to `main2` (and based on your advice, I had\nchanged those patches to rename to `topic` instead).\n\n> If we rename 'topic' to 'topico', then we'd still show branches, the\n> longest among which has 6 characters (the same as 'master'), so we\n> won't have to wonder where 'main2' came from; I guess that is another\n> way to solve this.\n\nSure, but then, that would adjust a perfectly nice name to a not-so-nice\nname just to avoid changing the number of columns to cut.\n\nIf you don't mind, I would like to stay on `topic` ;-)\n\nCiao,\nDscho\n"},{"id":"408169","messageId":"nycvar.QRO.7.76.6.2010221509430.56@tvgsbejvaqbjf.bet","threadId":"54464","inReplyTo":"xmqqblgv5jfk.fsf@gitster.c.googlers.com","subject":"Re: [PATCH 00/10] Prepare for changing the default branch name main (last manual part)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2020-10-22T13:11:49Z","receivedAt":"2020-10-22T13:11:55Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Wed, 21 Oct 2020, Junio C Hamano wrote:\n\n> \"Johannes Schindelin via GitGitGadget\" \n> writes:\n>\n> > In preparation for changing the default of init.defaultBranch to main, here\n> > are a couple of manual adjustments that cannot be automated (i.e., these\n> > adjustments are not mere search-and-replaces).\n> >\n> > This patch series is based on js/default-branch-name-part-3, and is part of\n> > the larger effort tracked at https://github.com/gitgitgadget/git/pull/655.\n> >\n> > The next patch series will be largely automated search-and-replaces;\n> > Obviously, the search-and-replace was the easy part, the manual inspection\n> > whether the changes are actually correct was much more involved.\n>\n> Yes. That's always the pain-point of a tree-wide change like this.\n\nTo help with such a huge change, I tried to minimize the manual patches,\nand wrote the exact shell commands into the non-manual patches. Hopefully\nthis will help us with the transition.\n\n> > What to expect next, after this patch series? Essentially, there is the\n> > large patch series that adjusts the entire test suite, with two patch series\n> > extracted from that effort: t5411 and t5515 simply require too large\n> > patches, and will therefore be presented as the next patch series after this\n> > one.\n>\n> This one is already a bit too ambitious in that it collides with\n> stuff in flight, by the way.\n\nOkay, I will leave out the t4013 changes from this patch series, and\nre-submit once `mk/diff-ignore-regex` advances to `next`.\n\nThank you for reviewing this patch series,\nDscho\n"},{"id":"408224","messageId":"pull.758.v2.git.1603461606.gitgitgadget@gmail.com","threadId":"54464","inReplyTo":"pull.758.git.1603135902.gitgitgadget@gmail.com","subject":"[PATCH v2 0/9] Prepare for changing the default branch name main (last manual part)","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-10-23T13:59:57Z","receivedAt":"2020-10-23T14:00:11Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"In preparation for changing the default of init.defaultBranch to main, here\nare a couple of manual adjustments that cannot be automated (i.e., these\nadjustments are not mere search-and-replaces).\n\nThis patch series is based on js/default-branch-name-part-3, and is part of\nthe larger effort tracked at https://github.com/gitgitgadget/git/pull/655.\n\nThe next patch series will be largely automated search-and-replaces;\nObviously, the search-and-replace was the easy part, the manual inspection\nwhether the changes are actually correct was much more involved.\n\nWhat to expect next, after this patch series? Essentially, there is the\nlarge patch series that adjusts the entire test suite, with two patch series\nextracted from that effort: t5411 and t5515 simply require too large\npatches, and will therefore be presented as the next patch series after this\none.\n\nChanges since v1:\n\n * The t4013 patch was moved out of this patch series, to be re-submitted at\n a later date, to avoid clashing with other patches in seen.\n * The commit message of 'fmt-merge-msg: also suppress \"into main\" by\n default' was adjusted to mention that we do the same for main as we do\n for master.\n * The t5703 patch now uses rain instead of none, to be closer to the\n default branch name.\n * The glob in t6200 was tightened to avoid matching maint.\n * The commit message of 't3200: prepare for main being shorter than master'\n stopped talking about main2 (which itself was a left-over from a previous\n iteration of a previous patch series).\n\nJohannes Schindelin (9):\n fmt-merge-msg: also suppress \"into main\" by default\n t9801: use `--` in preparation for default branch rename\n tests: start moving to a different default main branch name\n t6200: adjust suppression pattern to also match \"main\"\n t5703: adjust a test case for the upcoming default branch name\n t3200: prepare for `main` being shorter than `master`\n t9902: prepare a test for the upcoming default branch name\n tests: prepare aligned mentions of the default branch name\n t1400: prepare for `main` being default branch name\n\n fmt-merge-msg.c | 4 +-\n refs.c | 5 ++-\n t/lib-submodule-update.sh | 2 +-\n t/t0001-init.sh | 13 ++++--\n t/t1400-update-ref.sh | 10 ++---\n t/t3200-branch.sh | 16 +++----\n t/t3201-branch-contains.sh | 8 ++--\n t/t3203-branch-output.sh | 4 +-\n t/t3205-branch-color.sh | 8 ++--\n t/t5505-remote.sh | 30 ++++++-------\n t/t5510-fetch.sh | 8 ++--\n t/t5526-fetch-submodules.sh | 70 +++++++++++++++---------------\n t/t5606-clone-options.sh | 3 ++\n t/t5703-upload-pack-ref-in-want.sh | 6 +--\n t/t6200-fmt-merge-msg.sh | 2 +-\n t/t6302-for-each-ref-filter.sh | 24 +++++-----\n t/t9801-git-p4-branch.sh | 12 ++---\n t/t9902-completion.sh | 6 +--\n t/test-lib.sh | 7 +++\n 19 files changed, 130 insertions(+), 108 deletions(-)\n\n\nbase-commit: 538228ed23a1d5e17e89bb17086d4dda51325bd8\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-758%2Fdscho%2Fprepare-for-main-branch-manual-v2\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-758/dscho/prepare-for-main-branch-manual-v2\nPull-Request: https://github.com/gitgitgadget/git/pull/758\n\nRange-diff vs v1:\n\n 1: cf950c6f6a ! 1: bd2c72a348 fmt-merge-msg: also suppress \"into main\" by default\n @@ Commit message\n fmt-merge-msg: also suppress \"into main\" by default\n \n In preparation for changing the default branch name to `main`, let's\n - skip the suffix \"into main\" in merge commit messages.\n + skip the suffix \"into main\" in merge commit messages, the same way that\n + \"into master\" has been skipped by default.\n \n Signed-off-by: Johannes Schindelin \n \n 2: 5849eda331 = 2: e819084eb3 t9801: use `--` in preparation for default branch rename\n 3: d9469202c2 = 3: 9c608c311e tests: start moving to a different default main branch name\n 4: baeb01f706 < -: ---------- t4013: prepare for the new default branch name \"main\"\n 5: 7860d8d7df ! 4: 9bd0a89a79 t6200: adjust suppression pattern to also match \"main\"\n @@ t/t6200-fmt-merge-msg.sh: test_expect_success 'merge.suppressDest configuration'\n \tgrep -e \"Merge branch .side. into master$\" actual &&\n \n -\tgit -c merge.suppressDest=\"ma??er\" fmt-merge-msg <.git/FETCH_HEAD >full.3 &&\n -+\tgit -c merge.suppressDest=\"ma*\" fmt-merge-msg <.git/FETCH_HEAD >full.3 &&\n ++\tgit -c merge.suppressDest=\"ma?*[rn]\" fmt-merge-msg <.git/FETCH_HEAD >full.3 &&\n \thead -n1 full.3 >actual &&\n \tgrep -e \"Merge branch .side.\" actual &&\n \t! grep -e \" into master$\" actual\n 6: 0d2511d18f ! 5: b557ea5ac0 t5703: adjust a test case for the upcoming default branch name\n @@ t/t5703-upload-pack-ref-in-want.sh: test_expect_success 'server is initially beh\n \trm -rf local &&\n \tcp -r \"$LOCAL_PRISTINE\" local &&\n -\techo \"s/master/raster/\" >\"$HTTPD_ROOT_PATH/one-time-perl\" &&\n -+\techo \"s/main/none/\" >\"$HTTPD_ROOT_PATH/one-time-perl\" &&\n ++\techo \"s/main/rain/\" >\"$HTTPD_ROOT_PATH/one-time-perl\" &&\n \ttest_must_fail git -C local fetch 2>err &&\n \n -\ttest_i18ngrep \"fatal: remote error: unknown ref refs/heads/raster\" err\n -+\ttest_i18ngrep \"fatal: remote error: unknown ref refs/heads/none\" err\n ++\ttest_i18ngrep \"fatal: remote error: unknown ref refs/heads/rain\" err\n '\n \n # DO NOT add non-httpd-specific tests here, because the last part of this\n 7: e1740bb7d7 ! 6: 959a770c23 t3200: prepare for `main` being shorter than `master`\n @@ Commit message\n \n In the test case adjusted by this patch, we want to cut just after the\n longest shown ref name. Since `main` is shorter than `master`, we need\n - to decrease the number of characters. Since `main2` is shown, too, and\n + to decrease the number of characters. Since `topic` is shown, too, and\n since that is only one character shorter than `master`, we decrement the\n - length by one.\n + length by one instead of two.\n \n Signed-off-by: Johannes Schindelin \n \n 8: 1641d1950d = 7: 8db960009d t9902: prepare a test for the upcoming default branch name\n 9: 5c29a89d88 = 8: d15e39bb73 tests: prepare aligned mentions of the default branch name\n 10: 66365bce55 = 9: e542010fdd t1400: prepare for `main` being default branch name\n\n-- \ngitgitgadget\n"},{"id":"408225","messageId":"bd2c72a348881bd1e5c5b73545fa0afc866c4ff3.1603461606.git.gitgitgadget@gmail.com","threadId":"54464","inReplyTo":"pull.758.v2.git.1603461606.gitgitgadget@gmail.com","subject":"[PATCH v2 1/9] fmt-merge-msg: also suppress \"into main\" by default","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-10-23T13:59:58Z","receivedAt":"2020-10-23T14:00:13Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nIn preparation for changing the default branch name to `main`, let's\nskip the suffix \"into main\" in merge commit messages, the same way that\n\"into master\" has been skipped by default.\n\nSigned-off-by: Johannes Schindelin \n---\n fmt-merge-msg.c | 4 +++-\n 1 file changed, 3 insertions(+), 1 deletion(-)\n\ndiff --git a/fmt-merge-msg.c b/fmt-merge-msg.c\nindex bd22e1ea88..9a664a4a58 100644\n--- a/fmt-merge-msg.c\n+++ b/fmt-merge-msg.c\n@@ -626,8 +626,10 @@ int fmt_merge_msg(struct strbuf *in, struct strbuf *out,\n \tvoid *current_branch_to_free;\n \tstruct merge_parents merge_parents;\n \n-\tif (!suppress_dest_pattern_seen)\n+\tif (!suppress_dest_pattern_seen) {\n+\t\tstring_list_append(&suppress_dest_patterns, \"main\");\n \t\tstring_list_append(&suppress_dest_patterns, \"master\");\n+\t}\n \n \tmemset(&merge_parents, 0, sizeof(merge_parents));\n \n-- \ngitgitgadget\n\n"},{"id":"408226","messageId":"e819084eb31a1fd3861c28f38856fa334fca798c.1603461606.git.gitgitgadget@gmail.com","threadId":"54464","inReplyTo":"pull.758.v2.git.1603461606.gitgitgadget@gmail.com","subject":"[PATCH v2 2/9] t9801: use `--` in preparation for default branch rename","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-10-23T13:59:59Z","receivedAt":"2020-10-23T14:00:15Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nSeeing as we want to use `main` as the new default branch name used by\n`git init`, and that `main` is used as directory name in t9801, let's\ntighten the rev-list arguments to make it explicit when we are referring\nto a ref instead of a directory.\n\nSigned-off-by: Johannes Schindelin \n---\n t/t9801-git-p4-branch.sh | 12 ++++++------\n 1 file changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh\nindex 67ff2711f5..a3abd778f9 100755\n--- a/t/t9801-git-p4-branch.sh\n+++ b/t/t9801-git-p4-branch.sh\n@@ -67,7 +67,7 @@ test_expect_success 'import main, no branch detection' '\n \t(\n \t\tcd \"$git\" &&\n \t\tgit log --oneline --graph --decorate --all &&\n-\t\tgit rev-list master >wc &&\n+\t\tgit rev-list master -- >wc &&\n \t\ttest_line_count = 4 wc\n \t)\n '\n@@ -78,7 +78,7 @@ test_expect_success 'import branch1, no branch detection' '\n \t(\n \t\tcd \"$git\" &&\n \t\tgit log --oneline --graph --decorate --all &&\n-\t\tgit rev-list master >wc &&\n+\t\tgit rev-list master -- >wc &&\n \t\ttest_line_count = 2 wc\n \t)\n '\n@@ -89,7 +89,7 @@ test_expect_success 'import branch2, no branch detection' '\n \t(\n \t\tcd \"$git\" &&\n \t\tgit log --oneline --graph --decorate --all &&\n-\t\tgit rev-list master >wc &&\n+\t\tgit rev-list master -- >wc &&\n \t\ttest_line_count = 2 wc\n \t)\n '\n@@ -100,7 +100,7 @@ test_expect_success 'import depot, no branch detection' '\n \t(\n \t\tcd \"$git\" &&\n \t\tgit log --oneline --graph --decorate --all &&\n-\t\tgit rev-list master >wc &&\n+\t\tgit rev-list master -- >wc &&\n \t\ttest_line_count = 8 wc\n \t)\n '\n@@ -114,7 +114,7 @@ test_expect_success 'import depot, branch detection' '\n \t\tgit log --oneline --graph --decorate --all &&\n \n \t\t# 4 main commits\n-\t\tgit rev-list master >wc &&\n+\t\tgit rev-list master -- >wc &&\n \t\ttest_line_count = 4 wc &&\n \n \t\t# 3 main, 1 integrate, 1 on branch2\n@@ -137,7 +137,7 @@ test_expect_success 'import depot, branch detection, branchList branch definitio\n \t\tgit log --oneline --graph --decorate --all &&\n \n \t\t# 4 main commits\n-\t\tgit rev-list master >wc &&\n+\t\tgit rev-list master -- >wc &&\n \t\ttest_line_count = 4 wc &&\n \n \t\t# 3 main, 1 integrate, 1 on branch2\n-- \ngitgitgadget\n\n"},{"id":"408228","messageId":"9c608c311e6f6c22eaff6934f2048ca5e563a6cc.1603461606.git.gitgitgadget@gmail.com","threadId":"54464","inReplyTo":"pull.758.v2.git.1603461606.gitgitgadget@gmail.com","subject":"[PATCH v2 3/9] tests: start moving to a different default main branch name","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-10-23T14:00:00Z","receivedAt":"2020-10-23T14:00:16Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nTo allow for an incremental conversion to a new default main branch\nname, let's introduce `GIT_TEST_DEFAULT_MAIN_BRANCH_NAME`. This\nenvironment variable can be set at the top of each converted test\nscript, overriding the default main branch name to use when initializing\nnew repositories (or cloning empty repositories).\n\nNote: the `GIT_TEST_DEFAULT_MAIN_BRANCH_NAME` is _not_ intended to be\nused manually; many tests require a specific main branch name and cannot\nsimply work with another one. This `GIT_TEST_*` variable is meant purely\nfor the transitional period while the entire test suite is converted to\nuse `main` as the initial branch name by default.\n\nWe also introduce the `PREPARE_FOR_MAIN_BRANCH` prereq that determines\nwhether the default main branch name is `main`, and adjust a couple of\ntest functions to use it. This prereq will be used to temporarily\ndisable a couple test cases to allow for adjusting the test script\nincrementally. Once an entire test is adjusted, we will adjust the test\nso that it is run with `GIT_TEST_DEFAULT_MAIN_BRANCH_NAME=main`.\n\nSigned-off-by: Johannes Schindelin \n---\n refs.c | 5 ++++-\n t/lib-submodule-update.sh | 2 +-\n t/t0001-init.sh | 13 ++++++++++---\n t/t5606-clone-options.sh | 3 +++\n t/test-lib.sh | 7 +++++++\n 5 files changed, 25 insertions(+), 5 deletions(-)\n\ndiff --git a/refs.c b/refs.c\nindex fa01153151..392f0bbf68 100644\n--- a/refs.c\n+++ b/refs.c\n@@ -567,8 +567,11 @@ char *repo_default_branch_name(struct repository *r)\n \tconst char *config_key = \"init.defaultbranch\";\n \tconst char *config_display_key = \"init.defaultBranch\";\n \tchar *ret = NULL, *full_ref;\n+\tconst char *env = getenv(\"GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\");\n \n-\tif (repo_config_get_string(r, config_key, &ret) < 0)\n+\tif (env && *env)\n+\t\tret = xstrdup(env);\n+\telse if (repo_config_get_string(r, config_key, &ret) < 0)\n \t\tdie(_(\"could not retrieve `%s`\"), config_display_key);\n \n \tif (!ret)\ndiff --git a/t/lib-submodule-update.sh b/t/lib-submodule-update.sh\nindex 87a759149f..bd3fa3c6da 100644\n--- a/t/lib-submodule-update.sh\n+++ b/t/lib-submodule-update.sh\n@@ -144,7 +144,7 @@ create_lib_submodule_repo () {\n \t\tgit checkout -b valid_sub1 &&\n \t\tgit revert HEAD &&\n \n-\t\tgit checkout master\n+\t\tgit checkout \"${GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME-master}\"\n \t)\n }\n \ndiff --git a/t/t0001-init.sh b/t/t0001-init.sh\nindex 2f7c3dcd0f..69a320489f 100755\n--- a/t/t0001-init.sh\n+++ b/t/t0001-init.sh\n@@ -553,14 +553,21 @@ test_expect_success '--initial-branch' '\n \n test_expect_success 'overridden default initial branch name (config)' '\n \ttest_config_global init.defaultBranch nmb &&\n-\tgit init initial-branch-config &&\n+\tGIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= git init initial-branch-config &&\n \tgit -C initial-branch-config symbolic-ref HEAD >actual &&\n \tgrep nmb actual\n '\n \n+test_expect_success 'overridden default main branch name (env)' '\n+\ttest_config_global init.defaultBranch nmb &&\n+\tGIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=env git init main-branch-env &&\n+\tgit -C main-branch-env symbolic-ref HEAD >actual &&\n+\tgrep env actual\n+'\n+\n test_expect_success 'invalid default branch name' '\n-\ttest_config_global init.defaultBranch \"with space\" &&\n-\ttest_must_fail git init initial-branch-invalid 2>err &&\n+\ttest_must_fail env GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=\"with space\" \\\n+\t\tgit init initial-branch-invalid 2>err &&\n \ttest_i18ngrep \"invalid branch name\" err\n '\n \ndiff --git a/t/t5606-clone-options.sh b/t/t5606-clone-options.sh\nindex e69427f881..856eebf222 100755\n--- a/t/t5606-clone-options.sh\n+++ b/t/t5606-clone-options.sh\n@@ -37,6 +37,7 @@ test_expect_success 'redirected clone -v does show progress' '\n \n test_expect_success 'chooses correct default initial branch name' '\n \tgit init --bare empty &&\n+\tGIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \\\n \tgit -c init.defaultBranch=up clone empty whats-up &&\n \ttest refs/heads/up = $(git -C whats-up symbolic-ref HEAD) &&\n \ttest refs/heads/up = $(git -C whats-up config branch.up.merge)\n@@ -51,9 +52,11 @@ test_expect_success 'guesses initial branch name correctly' '\n \n \tgit -c init.defaultBranch=none init --bare no-head &&\n \tgit -C initial-branch push ../no-head guess abc &&\n+\tGIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \\\n \tgit clone no-head is-it2 &&\n \ttest_must_fail git -C is-it2 symbolic-ref refs/remotes/origin/HEAD &&\n \tgit -C no-head update-ref --no-deref HEAD refs/heads/guess &&\n+\tGIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \\\n \tgit -c init.defaultBranch=guess clone no-head is-it3 &&\n \ttest refs/remotes/origin/guess = \\\n \t\t$(git -C is-it3 symbolic-ref refs/remotes/origin/HEAD)\ndiff --git a/t/test-lib.sh b/t/test-lib.sh\nindex ef31f40037..6b35070d22 100644\n--- a/t/test-lib.sh\n+++ b/t/test-lib.sh\n@@ -1702,3 +1702,10 @@ test_lazy_prereq SHA1 '\n test_lazy_prereq REBASE_P '\n \ttest -z \"$GIT_TEST_SKIP_REBASE_P\"\n '\n+# Special-purpose prereq for transitioning to a new default branch name:\n+# Some tests need more than just a mindless (case-preserving) s/master/main/g\n+# replacement. The non-trivial adjustments are guarded behind this\n+# prerequisite, acting kind of as a feature flag\n+test_lazy_prereq PREPARE_FOR_MAIN_BRANCH '\n+\ttest \"$GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\" = main\n+'\n-- \ngitgitgadget\n\n"},{"id":"408227","messageId":"9bd0a89a79b6f771a3276ec3a3b70c6c636793b9.1603461606.git.gitgitgadget@gmail.com","threadId":"54464","inReplyTo":"pull.758.v2.git.1603461606.gitgitgadget@gmail.com","subject":"[PATCH v2 4/9] t6200: adjust suppression pattern to also match \"main\"","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-10-23T14:00:01Z","receivedAt":"2020-10-23T14:00:17Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nIn preparation to running t6200 with the default branch name set to\n\"main\", let's adjust the only non-trivial aspect thereof. The rest will\nbe done via a trivial `sed` invocation.\n\nSigned-off-by: Johannes Schindelin \n---\n t/t6200-fmt-merge-msg.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh\nindex 7d549748ef..f3e66eaf9b 100755\n--- a/t/t6200-fmt-merge-msg.sh\n+++ b/t/t6200-fmt-merge-msg.sh\n@@ -556,7 +556,7 @@ test_expect_success 'merge.suppressDest configuration' '\n \thead -n1 full.2 >actual &&\n \tgrep -e \"Merge branch .side. into master$\" actual &&\n \n-\tgit -c merge.suppressDest=\"ma??er\" fmt-merge-msg <.git/FETCH_HEAD >full.3 &&\n+\tgit -c merge.suppressDest=\"ma?*[rn]\" fmt-merge-msg <.git/FETCH_HEAD >full.3 &&\n \thead -n1 full.3 >actual &&\n \tgrep -e \"Merge branch .side.\" actual &&\n \t! grep -e \" into master$\" actual\n-- \ngitgitgadget\n\n"},{"id":"408229","messageId":"8db960009d071ee3247c972dfceacdf02b3a3dd0.1603461606.git.gitgitgadget@gmail.com","threadId":"54464","inReplyTo":"pull.758.v2.git.1603461606.gitgitgadget@gmail.com","subject":"[PATCH v2 7/9] t9902: prepare a test for the upcoming default branch name","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-10-23T14:00:04Z","receivedAt":"2020-10-23T14:00:22Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nWe need to adjust a test that uses a prefix of the default branch name,\nto accommodate for `main` being used soon.\n\nSigned-off-by: Johannes Schindelin \n---\n t/t9902-completion.sh | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/t/t9902-completion.sh b/t/t9902-completion.sh\nindex 7b7bc6e4bd..0badcf829b 100755\n--- a/t/t9902-completion.sh\n+++ b/t/t9902-completion.sh\n@@ -1055,13 +1055,13 @@ test_expect_success 'teardown after filtering matching refs' '\n \tgit -C otherrepo branch -D matching/branch-in-other\n '\n \n-test_expect_success '__git_refs - for-each-ref format specifiers in prefix' '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH '__git_refs - for-each-ref format specifiers in prefix' '\n \tcat >expected <<-EOF &&\n \tevil-%%-%42-%(refname)..master\n \tEOF\n \t(\n-\t\tcur=\"evil-%%-%42-%(refname)..mas\" &&\n-\t\t__git_refs \"\" \"\" \"evil-%%-%42-%(refname)..\" mas >\"$actual\"\n+\t\tcur=\"evil-%%-%42-%(refname)..mai\" &&\n+\t\t__git_refs \"\" \"\" \"evil-%%-%42-%(refname)..\" mai >\"$actual\"\n \t) &&\n \ttest_cmp expected \"$actual\"\n '\n-- \ngitgitgadget\n\n"},{"id":"408230","messageId":"959a770c2372ed68fdeb127bf794e0c158eefa81.1603461606.git.gitgitgadget@gmail.com","threadId":"54464","inReplyTo":"pull.758.v2.git.1603461606.gitgitgadget@gmail.com","subject":"[PATCH v2 6/9] t3200: prepare for `main` being shorter than `master`","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-10-23T14:00:03Z","receivedAt":"2020-10-23T14:00:22Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nIn the test case adjusted by this patch, we want to cut just after the\nlongest shown ref name. Since `main` is shorter than `master`, we need\nto decrease the number of characters. Since `topic` is shown, too, and\nsince that is only one character shorter than `master`, we decrement the\nlength by one instead of two.\n\nSigned-off-by: Johannes Schindelin \n---\n t/t3200-branch.sh | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/t/t3200-branch.sh b/t/t3200-branch.sh\nindex 6efe7a44bc..55b24b76ce 100755\n--- a/t/t3200-branch.sh\n+++ b/t/t3200-branch.sh\n@@ -375,9 +375,9 @@ test_expect_success 'git branch --column -v should fail' '\n \ttest_must_fail git branch --column -v\n '\n \n-test_expect_success 'git branch -v with column.ui ignored' '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH 'git branch -v with column.ui ignored' '\n \tgit config column.ui column &&\n-\tCOLUMNS=80 git branch -v | cut -c -9 | sed \"s/ *$//\" >actual &&\n+\tCOLUMNS=80 git branch -v | cut -c -8 | sed \"s/ *$//\" >actual &&\n \tgit config --unset column.ui &&\n \tcat >expect <<\\EOF &&\n a/b/c\n-- \ngitgitgadget\n\n"},{"id":"408231","messageId":"b557ea5ac0d344f183d0ab3b4e826a940e2d063c.1603461606.git.gitgitgadget@gmail.com","threadId":"54464","inReplyTo":"pull.758.v2.git.1603461606.gitgitgadget@gmail.com","subject":"[PATCH v2 5/9] t5703: adjust a test case for the upcoming default branch name","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-10-23T14:00:02Z","receivedAt":"2020-10-23T14:00:23Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nWe want to rename the default branch name used by `git init` in the near\nfuture, using `main` as the new name.\n\nIn preparation for that, we adjust a test case that wants to rename the\ndefault branch to a different name that however has the same length. We\nuse `none` as that name because it matches the length of `main`.\n\nAs this test case cannot possibly pass until the default branch name is\n_actually_ changed, we temporarily guard it behind a special-purpose\nprereq, until the test suite is fully converted to use that new default\nbranch name.\n\nSigned-off-by: Johannes Schindelin \n---\n t/t5703-upload-pack-ref-in-want.sh | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/t/t5703-upload-pack-ref-in-want.sh b/t/t5703-upload-pack-ref-in-want.sh\nindex d9ecf0f4a9..b46940b725 100755\n--- a/t/t5703-upload-pack-ref-in-want.sh\n+++ b/t/t5703-upload-pack-ref-in-want.sh\n@@ -383,14 +383,14 @@ test_expect_success 'server is initially behind - ref in want' '\n \ttest_cmp expected actual\n '\n \n-test_expect_success 'server loses a ref - ref in want' '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH 'server loses a ref - ref in want' '\n \tgit -C \"$REPO\" config uploadpack.allowRefInWant true &&\n \trm -rf local &&\n \tcp -r \"$LOCAL_PRISTINE\" local &&\n-\techo \"s/master/raster/\" >\"$HTTPD_ROOT_PATH/one-time-perl\" &&\n+\techo \"s/main/rain/\" >\"$HTTPD_ROOT_PATH/one-time-perl\" &&\n \ttest_must_fail git -C local fetch 2>err &&\n \n-\ttest_i18ngrep \"fatal: remote error: unknown ref refs/heads/raster\" err\n+\ttest_i18ngrep \"fatal: remote error: unknown ref refs/heads/rain\" err\n '\n \n # DO NOT add non-httpd-specific tests here, because the last part of this\n-- \ngitgitgadget\n\n"},{"id":"408232","messageId":"e542010fdde91256566b7129e1526b749500842a.1603461606.git.gitgitgadget@gmail.com","threadId":"54464","inReplyTo":"pull.758.v2.git.1603461606.gitgitgadget@gmail.com","subject":"[PATCH v2 9/9] t1400: prepare for `main` being default branch name","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-10-23T14:00:06Z","receivedAt":"2020-10-23T14:00:25Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nIn addition to the trivial search-and-replace, there are three\nnon-trivial adjustments necessary.\n\nMark the respective test cases with the transitional prereq and make\nthose non-trivial adjustments early, to make this change easier to\nreview.\n\nSigned-off-by: Johannes Schindelin \n---\n t/t1400-update-ref.sh | 10 +++++-----\n 1 file changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh\nindex 770e7be363..4c01e08551 100755\n--- a/t/t1400-update-ref.sh\n+++ b/t/t1400-update-ref.sh\n@@ -585,10 +585,10 @@ test_expect_success 'stdin fails on unbalanced quotes' '\n \tgrep \"fatal: badly quoted argument: \\\\\\\"master\" err\n '\n \n-test_expect_success 'stdin fails on invalid escape' '\n-\techo \"create $a \\\"ma\\zter\\\"\" >stdin &&\n+test_expect_success PREPARE_FOR_MAIN_BRANCH 'stdin fails on invalid escape' '\n+\techo \"create $a \\\"ma\\zn\\\"\" >stdin &&\n \ttest_must_fail git update-ref --stdin err &&\n-\tgrep \"fatal: badly quoted argument: \\\\\\\"ma\\\\\\\\zter\\\\\\\"\" err\n+\tgrep \"fatal: badly quoted argument: \\\\\\\"ma\\\\\\\\zn\\\\\\\"\" err\n '\n \n test_expect_success 'stdin fails on junk after quoted argument' '\n@@ -704,9 +704,9 @@ test_expect_success 'stdin succeeds with quoted argument' '\n \ttest_cmp expect actual\n '\n \n-test_expect_success 'stdin succeeds with escaped character' '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH 'stdin succeeds with escaped character' '\n \tgit update-ref -d $a &&\n-\techo \"create $a \\\"ma\\\\163ter\\\"\" >stdin &&\n+\techo \"create $a \\\"ma\\\\151n\\\"\" >stdin &&\n \tgit update-ref --stdin expect &&\n \tgit rev-parse $a >actual &&\n-- \ngitgitgadget\n"},{"id":"408233","messageId":"d15e39bb7355064bf0305f82e1892dc42298059e.1603461606.git.gitgitgadget@gmail.com","threadId":"54464","inReplyTo":"pull.758.v2.git.1603461606.gitgitgadget@gmail.com","subject":"[PATCH v2 8/9] tests: prepare aligned mentions of the default branch name","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-10-23T14:00:05Z","receivedAt":"2020-10-23T14:00:25Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nIn some tests, the default branch name is part of aligned output. As we\nwant to change the default branch name to `main`, which is two\ncharacters shorter than the old default branch name, we will have to\nadjust those tests.\n\nSince we use the original default branch name until the entire test\nsuite has been adjusted accordingly, the touched test cases need to be\nguarded by a prereq (that is so far disabled so that they are skipped\nfor now).\n\nThe test cases that depend on those test cases that are newly guarded by\nthat prereq naturally have to be guarded, too.\n\nSigned-off-by: Johannes Schindelin \n---\n t/t3200-branch.sh | 12 +++---\n t/t3201-branch-contains.sh | 8 ++--\n t/t3203-branch-output.sh | 4 +-\n t/t3205-branch-color.sh | 8 ++--\n t/t5505-remote.sh | 30 +++++++--------\n t/t5510-fetch.sh | 8 ++--\n t/t5526-fetch-submodules.sh | 70 +++++++++++++++++-----------------\n t/t6302-for-each-ref-filter.sh | 24 ++++++------\n 8 files changed, 82 insertions(+), 82 deletions(-)\n\ndiff --git a/t/t3200-branch.sh b/t/t3200-branch.sh\nindex 55b24b76ce..a0b832d59e 100755\n--- a/t/t3200-branch.sh\n+++ b/t/t3200-branch.sh\n@@ -321,11 +321,11 @@ test_expect_success 'git branch --list -v with --abbrev' '\n \n '\n \n-test_expect_success 'git branch --column' '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH 'git branch --column' '\n \tCOLUMNS=81 git branch --column=column >actual &&\n \tcat >expect <<\\EOF &&\n- a/b/c bam foo l * master n o/p r\n- abc bar j/k m/m mb o/o q topic\n+ a/b/c bam foo l * main n o/p r\n+ abc bar j/k m/m mb o/o q topic\n EOF\n \ttest_cmp expect actual\n '\n@@ -358,15 +358,15 @@ EOF\n \ttest_cmp expect actual\n '\n \n-test_expect_success 'git branch with column.*' '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH 'git branch with column.*' '\n \tgit config column.ui column &&\n \tgit config column.branch \"dense\" &&\n \tCOLUMNS=80 git branch >actual &&\n \tgit config --unset column.branch &&\n \tgit config --unset column.ui &&\n \tcat >expect <<\\EOF &&\n- a/b/c bam foo l * master n o/p r\n- abc bar j/k m/m mb o/o q topic\n+ a/b/c bam foo l * main n o/p r\n+ abc bar j/k m/m mb o/o q topic\n EOF\n \ttest_cmp expect actual\n '\ndiff --git a/t/t3201-branch-contains.sh b/t/t3201-branch-contains.sh\nindex efea5c4971..3733cd0091 100755\n--- a/t/t3201-branch-contains.sh\n+++ b/t/t3201-branch-contains.sh\n@@ -242,7 +242,7 @@ test_expect_success 'branch --merged combined with --no-merged' '\n # Here \"topic\" tracks \"master\" with one extra commit, and \"zzz\" points to the\n # same tip as master The name \"zzz\" must come alphabetically after \"topic\"\n # as we process them in that order.\n-test_expect_success 'branch --merged with --verbose' '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH 'branch --merged with --verbose' '\n \tgit branch --track topic master &&\n \tgit branch zzz topic &&\n \tgit checkout topic &&\n@@ -256,9 +256,9 @@ test_expect_success 'branch --merged with --verbose' '\n \ttest_cmp expect actual &&\n \tgit branch --verbose --merged topic >actual &&\n \tcat >expect <<-EOF &&\n-\t master $(git rev-parse --short master) second on master\n-\t* topic $(git rev-parse --short topic ) [ahead 1] foo\n-\t zzz $(git rev-parse --short zzz ) second on master\n+\t main $(git rev-parse --short main) second on main\n+\t* topic $(git rev-parse --short topic ) [ahead 1] foo\n+\t zzz $(git rev-parse --short zzz ) second on main\n \tEOF\n \ttest_i18ncmp expect actual\n '\ndiff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh\nindex 71818b90f0..d65586541d 100755\n--- a/t/t3203-branch-output.sh\n+++ b/t/t3203-branch-output.sh\n@@ -329,7 +329,7 @@ test_expect_success '--color overrides auto-color' '\n \ttest_cmp expect.color actual\n '\n \n-test_expect_success 'verbose output lists worktree path' '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH 'verbose output lists worktree path' '\n \tone=$(git rev-parse --short HEAD) &&\n \ttwo=$(git rev-parse --short master) &&\n \tcat >expect <<-EOF &&\n@@ -337,7 +337,7 @@ test_expect_success 'verbose output lists worktree path' '\n \t ambiguous $one one\n \t branch-one $two two\n \t+ branch-two $one ($(pwd)/worktree_dir) one\n-\t master $two two\n+\t main $two two\n \t ref-to-branch $two two\n \t ref-to-remote $two two\n \tEOF\ndiff --git a/t/t3205-branch-color.sh b/t/t3205-branch-color.sh\nindex 4f1e16bb44..289625c464 100755\n--- a/t/t3205-branch-color.sh\n+++ b/t/t3205-branch-color.sh\n@@ -28,12 +28,12 @@ test_expect_success 'regular output shows colors' '\n \ttest_cmp expect actual\n '\n \n-test_expect_success 'verbose output shows colors' '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH 'verbose output shows colors' '\n \toid=$(git rev-parse --short HEAD) &&\n \tcat >expect <<-EOF &&\n-\t* master $oid foo\n-\t other $oid foo\n-\t remotes/origin/master $oid foo\n+\t* main $oid foo\n+\t other $oid foo\n+\t remotes/origin/main $oid foo\n \tEOF\n \tgit branch --color -v -a >actual.raw &&\n \ttest_decode_color actual &&\ndiff --git a/t/t5505-remote.sh b/t/t5505-remote.sh\nindex 8d62edd98b..de0e3df14a 100755\n--- a/t/t5505-remote.sh\n+++ b/t/t5505-remote.sh\n@@ -200,28 +200,28 @@ cat >test/expect <test/expect < refspec DWIM and advice' '\n \t)\n '\n \n-test_expect_success 'refs/remotes/* refspec and unqualified DWIM and advice' '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH 'refs/remotes/* refspec and unqualified DWIM and advice' '\n \t(\n \t\tcd two &&\n \t\tgit tag -a -m \"Some tag\" my-tag master &&\ndiff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh\nindex dbc724e4c0..5d673358f9 100755\n--- a/t/t5510-fetch.sh\n+++ b/t/t5510-fetch.sh\n@@ -942,7 +942,7 @@ test_expect_success 'fetching with auto-gc does not lock up' '\n \t)\n '\n \n-test_expect_success C_LOCALE_OUTPUT 'fetch aligned output' '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH,C_LOCALE_OUTPUT 'fetch aligned output' '\n \tgit clone . full-output &&\n \ttest_commit looooooooooooong-tag &&\n \t(\n@@ -951,13 +951,13 @@ test_expect_success C_LOCALE_OUTPUT 'fetch aligned output' '\n \t\tgrep -e \"->\" actual | cut -c 22- >../actual\n \t) &&\n \tcat >expect <<-\\EOF &&\n-\tmaster -> origin/master\n+\tmain -> origin/main\n \tlooooooooooooong-tag -> looooooooooooong-tag\n \tEOF\n \ttest_cmp expect actual\n '\n \n-test_expect_success C_LOCALE_OUTPUT 'fetch compact output' '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH,C_LOCALE_OUTPUT 'fetch compact output' '\n \tgit clone . compact &&\n \ttest_commit extraaa &&\n \t(\n@@ -966,7 +966,7 @@ test_expect_success C_LOCALE_OUTPUT 'fetch compact output' '\n \t\tgrep -e \"->\" actual | cut -c 22- >../actual\n \t) &&\n \tcat >expect <<-\\EOF &&\n-\tmaster -> origin/*\n+\tmain -> origin/*\n \textraaa -> *\n \tEOF\n \ttest_cmp expect actual\ndiff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh\nindex 63205dfdf9..dd8e423d25 100755\n--- a/t/t5526-fetch-submodules.sh\n+++ b/t/t5526-fetch-submodules.sh\n@@ -18,7 +18,7 @@ add_upstream_commit() {\n \t\thead2=$(git rev-parse --short HEAD) &&\n \t\techo \"Fetching submodule submodule\" > ../expect.err &&\n \t\techo \"From $pwd/submodule\" >> ../expect.err &&\n-\t\techo \" $head1..$head2 master -> origin/master\" >> ../expect.err\n+\t\techo \" $head1..$head2 main -> origin/main\" >> ../expect.err\n \t) &&\n \t(\n \t\tcd deepsubmodule &&\n@@ -30,7 +30,7 @@ add_upstream_commit() {\n \t\thead2=$(git rev-parse --short HEAD) &&\n \t\techo \"Fetching submodule submodule/subdir/deepsubmodule\" >> ../expect.err\n \t\techo \"From $pwd/deepsubmodule\" >> ../expect.err &&\n-\t\techo \" $head1..$head2 master -> origin/master\" >> ../expect.err\n+\t\techo \" $head1..$head2 main -> origin/main\" >> ../expect.err\n \t)\n }\n \n@@ -61,7 +61,7 @@ test_expect_success setup '\n \t)\n '\n \n-test_expect_success \"fetch --recurse-submodules recurses into submodules\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"fetch --recurse-submodules recurses into submodules\" '\n \tadd_upstream_commit &&\n \t(\n \t\tcd downstream &&\n@@ -71,7 +71,7 @@ test_expect_success \"fetch --recurse-submodules recurses into submodules\" '\n \ttest_i18ncmp expect.err actual.err\n '\n \n-test_expect_success \"submodule.recurse option triggers recursive fetch\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"submodule.recurse option triggers recursive fetch\" '\n \tadd_upstream_commit &&\n \t(\n \t\tcd downstream &&\n@@ -81,7 +81,7 @@ test_expect_success \"submodule.recurse option triggers recursive fetch\" '\n \ttest_i18ncmp expect.err actual.err\n '\n \n-test_expect_success \"fetch --recurse-submodules -j2 has the same output behaviour\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"fetch --recurse-submodules -j2 has the same output behaviour\" '\n \tadd_upstream_commit &&\n \t(\n \t\tcd downstream &&\n@@ -111,7 +111,7 @@ test_expect_success \"fetch --no-recurse-submodules only fetches superproject\" '\n \ttest_must_be_empty actual.err\n '\n \n-test_expect_success \"using fetchRecurseSubmodules=true in .gitmodules recurses into submodules\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"using fetchRecurseSubmodules=true in .gitmodules recurses into submodules\" '\n \t(\n \t\tcd downstream &&\n \t\tgit config -f .gitmodules submodule.submodule.fetchRecurseSubmodules true &&\n@@ -141,7 +141,7 @@ test_expect_success \"using fetchRecurseSubmodules=false in .git/config overrides\n \ttest_must_be_empty actual.err\n '\n \n-test_expect_success \"--recurse-submodules overrides fetchRecurseSubmodules setting from .git/config\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"--recurse-submodules overrides fetchRecurseSubmodules setting from .git/config\" '\n \t(\n \t\tcd downstream &&\n \t\tgit fetch --recurse-submodules >../actual.out 2>../actual.err &&\n@@ -170,7 +170,7 @@ test_expect_success \"--quiet propagates to parallel submodules\" '\n \ttest_must_be_empty actual.err\n '\n \n-test_expect_success \"--dry-run propagates to submodules\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"--dry-run propagates to submodules\" '\n \tadd_upstream_commit &&\n \t(\n \t\tcd downstream &&\n@@ -180,7 +180,7 @@ test_expect_success \"--dry-run propagates to submodules\" '\n \ttest_i18ncmp expect.err actual.err\n '\n \n-test_expect_success \"Without --dry-run propagates to submodules\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"Without --dry-run propagates to submodules\" '\n \t(\n \t\tcd downstream &&\n \t\tgit fetch --recurse-submodules >../actual.out 2>../actual.err\n@@ -189,7 +189,7 @@ test_expect_success \"Without --dry-run propagates to submodules\" '\n \ttest_i18ncmp expect.err actual.err\n '\n \n-test_expect_success \"recurseSubmodules=true propagates into submodules\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"recurseSubmodules=true propagates into submodules\" '\n \tadd_upstream_commit &&\n \t(\n \t\tcd downstream &&\n@@ -200,7 +200,7 @@ test_expect_success \"recurseSubmodules=true propagates into submodules\" '\n \ttest_i18ncmp expect.err actual.err\n '\n \n-test_expect_success \"--recurse-submodules overrides config in submodule\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"--recurse-submodules overrides config in submodule\" '\n \tadd_upstream_commit &&\n \t(\n \t\tcd downstream &&\n@@ -225,7 +225,7 @@ test_expect_success \"--no-recurse-submodules overrides config setting\" '\n \ttest_must_be_empty actual.err\n '\n \n-test_expect_success \"Recursion doesn't happen when no new commits are fetched in the superproject\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"Recursion doesn't happen when no new commits are fetched in the superproject\" '\n \t(\n \t\tcd downstream &&\n \t\t(\n@@ -239,13 +239,13 @@ test_expect_success \"Recursion doesn't happen when no new commits are fetched in\n \ttest_must_be_empty actual.err\n '\n \n-test_expect_success \"Recursion stops when no new submodule commits are fetched\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"Recursion stops when no new submodule commits are fetched\" '\n \thead1=$(git rev-parse --short HEAD) &&\n \tgit add submodule &&\n \tgit commit -m \"new submodule\" &&\n \thead2=$(git rev-parse --short HEAD) &&\n \techo \"From $pwd/.\" > expect.err.sub &&\n-\techo \" $head1..$head2 master -> origin/master\" >>expect.err.sub &&\n+\techo \" $head1..$head2 main -> origin/main\" >>expect.err.sub &&\n \thead -3 expect.err >> expect.err.sub &&\n \t(\n \t\tcd downstream &&\n@@ -255,7 +255,7 @@ test_expect_success \"Recursion stops when no new submodule commits are fetched\"\n \ttest_must_be_empty actual.out\n '\n \n-test_expect_success \"Recursion doesn't happen when new superproject commits don't change any submodules\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"Recursion doesn't happen when new superproject commits don't change any submodules\" '\n \tadd_upstream_commit &&\n \thead1=$(git rev-parse --short HEAD) &&\n \techo a > file &&\n@@ -263,7 +263,7 @@ test_expect_success \"Recursion doesn't happen when new superproject commits don'\n \tgit commit -m \"new file\" &&\n \thead2=$(git rev-parse --short HEAD) &&\n \techo \"From $pwd/.\" > expect.err.file &&\n-\techo \" $head1..$head2 master -> origin/master\" >> expect.err.file &&\n+\techo \" $head1..$head2 main -> origin/main\" >> expect.err.file &&\n \t(\n \t\tcd downstream &&\n \t\tgit fetch >../actual.out 2>../actual.err\n@@ -272,7 +272,7 @@ test_expect_success \"Recursion doesn't happen when new superproject commits don'\n \ttest_i18ncmp expect.err.file actual.err\n '\n \n-test_expect_success \"Recursion picks up config in submodule\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"Recursion picks up config in submodule\" '\n \t(\n \t\tcd downstream &&\n \t\tgit fetch --recurse-submodules &&\n@@ -287,7 +287,7 @@ test_expect_success \"Recursion picks up config in submodule\" '\n \tgit commit -m \"new submodule\" &&\n \thead2=$(git rev-parse --short HEAD) &&\n \techo \"From $pwd/.\" > expect.err.sub &&\n-\techo \" $head1..$head2 master -> origin/master\" >> expect.err.sub &&\n+\techo \" $head1..$head2 main -> origin/main\" >> expect.err.sub &&\n \tcat expect.err >> expect.err.sub &&\n \t(\n \t\tcd downstream &&\n@@ -301,7 +301,7 @@ test_expect_success \"Recursion picks up config in submodule\" '\n \ttest_must_be_empty actual.out\n '\n \n-test_expect_success \"Recursion picks up all submodules when necessary\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"Recursion picks up all submodules when necessary\" '\n \tadd_upstream_commit &&\n \t(\n \t\tcd submodule &&\n@@ -316,14 +316,14 @@ test_expect_success \"Recursion picks up all submodules when necessary\" '\n \t\thead2=$(git rev-parse --short HEAD) &&\n \t\techo \"Fetching submodule submodule\" > ../expect.err.sub &&\n \t\techo \"From $pwd/submodule\" >> ../expect.err.sub &&\n-\t\techo \" $head1..$head2 master -> origin/master\" >> ../expect.err.sub\n+\t\techo \" $head1..$head2 main -> origin/main\" >> ../expect.err.sub\n \t) &&\n \thead1=$(git rev-parse --short HEAD) &&\n \tgit add submodule &&\n \tgit commit -m \"new submodule\" &&\n \thead2=$(git rev-parse --short HEAD) &&\n \techo \"From $pwd/.\" > expect.err.2 &&\n-\techo \" $head1..$head2 master -> origin/master\" >> expect.err.2 &&\n+\techo \" $head1..$head2 main -> origin/main\" >> expect.err.2 &&\n \tcat expect.err.sub >> expect.err.2 &&\n \ttail -3 expect.err >> expect.err.2 &&\n \t(\n@@ -334,7 +334,7 @@ test_expect_success \"Recursion picks up all submodules when necessary\" '\n \ttest_must_be_empty actual.out\n '\n \n-test_expect_success \"'--recurse-submodules=on-demand' doesn't recurse when no new commits are fetched in the superproject (and ignores config)\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"'--recurse-submodules=on-demand' doesn't recurse when no new commits are fetched in the superproject (and ignores config)\" '\n \tadd_upstream_commit &&\n \t(\n \t\tcd submodule &&\n@@ -349,7 +349,7 @@ test_expect_success \"'--recurse-submodules=on-demand' doesn't recurse when no ne\n \t\thead2=$(git rev-parse --short HEAD) &&\n \t\techo Fetching submodule submodule > ../expect.err.sub &&\n \t\techo \"From $pwd/submodule\" >> ../expect.err.sub &&\n-\t\techo \" $head1..$head2 master -> origin/master\" >> ../expect.err.sub\n+\t\techo \" $head1..$head2 main -> origin/main\" >> ../expect.err.sub\n \t) &&\n \t(\n \t\tcd downstream &&\n@@ -361,14 +361,14 @@ test_expect_success \"'--recurse-submodules=on-demand' doesn't recurse when no ne\n \ttest_must_be_empty actual.err\n '\n \n-test_expect_success \"'--recurse-submodules=on-demand' recurses as deep as necessary (and ignores config)\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"'--recurse-submodules=on-demand' recurses as deep as necessary (and ignores config)\" '\n \thead1=$(git rev-parse --short HEAD) &&\n \tgit add submodule &&\n \tgit commit -m \"new submodule\" &&\n \thead2=$(git rev-parse --short HEAD) &&\n \ttail -3 expect.err > expect.err.deepsub &&\n \techo \"From $pwd/.\" > expect.err &&\n-\techo \" $head1..$head2 master -> origin/master\" >>expect.err &&\n+\techo \" $head1..$head2 main -> origin/main\" >>expect.err &&\n \tcat expect.err.sub >> expect.err &&\n \tcat expect.err.deepsub >> expect.err &&\n \t(\n@@ -389,7 +389,7 @@ test_expect_success \"'--recurse-submodules=on-demand' recurses as deep as necess\n \ttest_i18ncmp expect.err actual.err\n '\n \n-test_expect_success \"'--recurse-submodules=on-demand' stops when no new submodule commits are found in the superproject (and ignores config)\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"'--recurse-submodules=on-demand' stops when no new submodule commits are found in the superproject (and ignores config)\" '\n \tadd_upstream_commit &&\n \thead1=$(git rev-parse --short HEAD) &&\n \techo a >> file &&\n@@ -397,7 +397,7 @@ test_expect_success \"'--recurse-submodules=on-demand' stops when no new submodul\n \tgit commit -m \"new file\" &&\n \thead2=$(git rev-parse --short HEAD) &&\n \techo \"From $pwd/.\" > expect.err.file &&\n-\techo \" $head1..$head2 master -> origin/master\" >> expect.err.file &&\n+\techo \" $head1..$head2 main -> origin/main\" >> expect.err.file &&\n \t(\n \t\tcd downstream &&\n \t\tgit fetch --recurse-submodules=on-demand >../actual.out 2>../actual.err\n@@ -406,7 +406,7 @@ test_expect_success \"'--recurse-submodules=on-demand' stops when no new submodul\n \ttest_i18ncmp expect.err.file actual.err\n '\n \n-test_expect_success \"'fetch.recurseSubmodules=on-demand' overrides global config\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"'fetch.recurseSubmodules=on-demand' overrides global config\" '\n \t(\n \t\tcd downstream &&\n \t\tgit fetch --recurse-submodules\n@@ -418,7 +418,7 @@ test_expect_success \"'fetch.recurseSubmodules=on-demand' overrides global config\n \tgit commit -m \"new submodule\" &&\n \thead2=$(git rev-parse --short HEAD) &&\n \techo \"From $pwd/.\" > expect.err.2 &&\n-\techo \" $head1..$head2 master -> origin/master\" >>expect.err.2 &&\n+\techo \" $head1..$head2 main -> origin/main\" >>expect.err.2 &&\n \thead -3 expect.err >> expect.err.2 &&\n \t(\n \t\tcd downstream &&\n@@ -434,7 +434,7 @@ test_expect_success \"'fetch.recurseSubmodules=on-demand' overrides global config\n \ttest_i18ncmp expect.err.2 actual.err\n '\n \n-test_expect_success \"'submodule..fetchRecurseSubmodules=on-demand' overrides fetch.recurseSubmodules\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"'submodule..fetchRecurseSubmodules=on-demand' overrides fetch.recurseSubmodules\" '\n \t(\n \t\tcd downstream &&\n \t\tgit fetch --recurse-submodules\n@@ -446,7 +446,7 @@ test_expect_success \"'submodule..fetchRecurseSubmodules=on-demand' override\n \tgit commit -m \"new submodule\" &&\n \thead2=$(git rev-parse --short HEAD) &&\n \techo \"From $pwd/.\" > expect.err.2 &&\n-\techo \" $head1..$head2 master -> origin/master\" >>expect.err.2 &&\n+\techo \" $head1..$head2 main -> origin/main\" >>expect.err.2 &&\n \thead -3 expect.err >> expect.err.2 &&\n \t(\n \t\tcd downstream &&\n@@ -462,7 +462,7 @@ test_expect_success \"'submodule..fetchRecurseSubmodules=on-demand' override\n \ttest_i18ncmp expect.err.2 actual.err\n '\n \n-test_expect_success \"don't fetch submodule when newly recorded commits are already present\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"don't fetch submodule when newly recorded commits are already present\" '\n \t(\n \t\tcd submodule &&\n \t\tgit checkout -q HEAD^^\n@@ -472,7 +472,7 @@ test_expect_success \"don't fetch submodule when newly recorded commits are alrea\n \tgit commit -m \"submodule rewound\" &&\n \thead2=$(git rev-parse --short HEAD) &&\n \techo \"From $pwd/.\" > expect.err &&\n-\techo \" $head1..$head2 master -> origin/master\" >> expect.err &&\n+\techo \" $head1..$head2 main -> origin/main\" >> expect.err &&\n \t(\n \t\tcd downstream &&\n \t\tgit fetch >../actual.out 2>../actual.err\n@@ -485,7 +485,7 @@ test_expect_success \"don't fetch submodule when newly recorded commits are alrea\n \t)\n '\n \n-test_expect_success \"'fetch.recurseSubmodules=on-demand' works also without .gitmodules entry\" '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH \"'fetch.recurseSubmodules=on-demand' works also without .gitmodules entry\" '\n \t(\n \t\tcd downstream &&\n \t\tgit fetch --recurse-submodules\n@@ -497,7 +497,7 @@ test_expect_success \"'fetch.recurseSubmodules=on-demand' works also without .git\n \tgit commit -m \"new submodule without .gitmodules\" &&\n \thead2=$(git rev-parse --short HEAD) &&\n \techo \"From $pwd/.\" >expect.err.2 &&\n-\techo \" $head1..$head2 master -> origin/master\" >>expect.err.2 &&\n+\techo \" $head1..$head2 main -> origin/main\" >>expect.err.2 &&\n \thead -3 expect.err >>expect.err.2 &&\n \t(\n \t\tcd downstream &&\ndiff --git a/t/t6302-for-each-ref-filter.sh b/t/t6302-for-each-ref-filter.sh\nindex 781e470aea..0a21669f56 100755\n--- a/t/t6302-for-each-ref-filter.sh\n+++ b/t/t6302-for-each-ref-filter.sh\n@@ -113,9 +113,9 @@ test_expect_success '%(color) must fail' '\n \ttest_must_fail git for-each-ref --format=\"%(color)%(refname)\"\n '\n \n-test_expect_success 'left alignment is default' '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH 'left alignment is default' '\n \tcat >expect <<-\\EOF &&\n-\trefname is refs/heads/master |refs/heads/master\n+\trefname is refs/heads/main |refs/heads/main\n \trefname is refs/heads/side |refs/heads/side\n \trefname is refs/odd/spot |refs/odd/spot\n \trefname is refs/tags/annotated-tag|refs/tags/annotated-tag\n@@ -131,9 +131,9 @@ test_expect_success 'left alignment is default' '\n \ttest_cmp expect actual\n '\n \n-test_expect_success 'middle alignment' '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH 'middle alignment' '\n \tcat >expect <<-\\EOF &&\n-\t| refname is refs/heads/master |refs/heads/master\n+\t| refname is refs/heads/main |refs/heads/main\n \t| refname is refs/heads/side |refs/heads/side\n \t| refname is refs/odd/spot |refs/odd/spot\n \t|refname is refs/tags/annotated-tag|refs/tags/annotated-tag\n@@ -149,9 +149,9 @@ test_expect_success 'middle alignment' '\n \ttest_cmp expect actual\n '\n \n-test_expect_success 'right alignment' '\n+test_expect_success PREPARE_FOR_MAIN_BRANCH 'right alignment' '\n \tcat >expect <<-\\EOF &&\n-\t| refname is refs/heads/master|refs/heads/master\n+\t| refname is refs/heads/main|refs/heads/main\n \t| refname is refs/heads/side|refs/heads/side\n \t| refname is refs/odd/spot|refs/odd/spot\n \t|refname is refs/tags/annotated-tag|refs/tags/annotated-tag\n@@ -168,7 +168,7 @@ test_expect_success 'right alignment' '\n '\n \n cat >expect <<-\\EOF\n-| refname is refs/heads/master |refs/heads/master\n+| refname is refs/heads/main |refs/heads/main\n | refname is refs/heads/side |refs/heads/side\n | refname is refs/odd/spot |refs/odd/spot\n | refname is refs/tags/annotated-tag |refs/tags/annotated-tag\n@@ -184,7 +184,7 @@ EOF\n test_align_permutations() {\n \twhile read -r option\n \tdo\n-\t\ttest_expect_success \"align:$option\" '\n+\t\ttest_expect_success PREPARE_FOR_MAIN_BRANCH \"align:$option\" '\n \t\t\tgit for-each-ref --format=\"|%(align:$option)refname is %(refname)%(end)|%(refname)\" >actual &&\n \t\t\ttest_cmp expect actual\n \t\t'\n@@ -213,9 +213,9 @@ EOF\n \n # Individual atoms inside %(align:...) and %(end) must not be quoted.\n \n-test_expect_success 'alignment with format quote' \"\n+test_expect_success PREPARE_FOR_MAIN_BRANCH 'alignment with format quote' \"\n \tcat >expect <<-\\EOF &&\n-\t|' '\\''master| A U Thor'\\'' '|\n+\t|' '\\''main| A U Thor'\\'' '|\n \t|' '\\''side| A U Thor'\\'' '|\n \t|' '\\''odd/spot| A U Thor'\\'' '|\n \t|' '\\''annotated-tag| '\\'' '|\n@@ -231,9 +231,9 @@ test_expect_success 'alignment with format quote' \"\n \ttest_cmp expect actual\n \"\n \n-test_expect_success 'nested alignment with quote formatting' \"\n+test_expect_success PREPARE_FOR_MAIN_BRANCH 'nested alignment with quote formatting' \"\n \tcat >expect <<-\\EOF &&\n-\t|' master '|\n+\t|' main '|\n \t|' side '|\n \t|' odd/spot '|\n \t|' annotated-tag '|\n-- \ngitgitgadget\n\n"},{"id":"408248","messageId":"xmqqzh4dgcgh.fsf@gitster.c.googlers.com","threadId":"54464","inReplyTo":"pull.758.v2.git.1603461606.gitgitgadget@gmail.com","subject":"Re: [PATCH v2 0/9] Prepare for changing the default branch name main (last manual part)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-10-23T15:59:42Z","receivedAt":"2020-10-23T16:00:45Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Johannes Schindelin via GitGitGadget\" \nwrites:\n\n> Changes since v1:\n>\n> * The t4013 patch was moved out of this patch series, to be re-submitted at\n> a later date, to avoid clashing with other patches in seen.\n> * The commit message of 'fmt-merge-msg: also suppress \"into main\" by\n> default' was adjusted to mention that we do the same for main as we do\n> for master.\n> * The t5703 patch now uses rain instead of none, to be closer to the\n> default branch name.\n> * The glob in t6200 was tightened to avoid matching maint.\n> * The commit message of 't3200: prepare for main being shorter than master'\n> stopped talking about main2 (which itself was a left-over from a previous\n> iteration of a previous patch series).\n\nAll looked sensible. Thanks; will replace and hopefully we can move\nthese to 'next' once we rebuild it on 2.29.\n\n"}]}