{"thread":{"id":"54244","subject":"[PATCH 3/5] t3200: avoid variations of the `master` branch name","startedAt":"2020-09-16T18:11:22Z","lastAt":"2020-09-30T22:57:47Z","messageCount":38,"participants":["Johannes Schindelin via GitGitGadget","Junio C Hamano","Jeff King","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":5},"messages":[{"id":"405640","messageId":"2f1d0a2df41f567bc1a8bc446c26e1cb8b6dc36c.1600279853.git.gitgitgadget@gmail.com","threadId":"54244","inReplyTo":"pull.734.git.1600279853.gitgitgadget@gmail.com","subject":"[PATCH 3/5] t3200: avoid variations of the `master` branch name","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-09-16T18:10:51Z","receivedAt":"2020-09-16T18:11:22Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nTo avoid branch names with a loaded history, we already started to avoid\nusing the name \"master\" in a couple instances.\n\nThe `t3200-branch.sh` script uses variations of this name for branches\nother than the default one. So let's change those names, as\n\"lowest-hanging fruits\" in the effort to use more inclusive naming\nthroughout Git's source code.\n\nIn this particular instance, this requires a couple of non-trivial\nadjustments, as the aligned output depends on the maximum length of the\ndisplayed branches (which we now changed), and also on the alphabetical\norder (which we now changed, too).\n\nSigned-off-by: Johannes Schindelin \n---\n t/t3200-branch.sh | 34 +++++++++++++++++-----------------\n 1 file changed, 17 insertions(+), 17 deletions(-)\n\ndiff --git a/t/t3200-branch.sh b/t/t3200-branch.sh\nindex 4c0734157b..c1b881c0b8 100755\n--- a/t/t3200-branch.sh\n+++ b/t/t3200-branch.sh\n@@ -234,10 +234,10 @@ test_expect_success 'git branch -M master master should work when master is chec\n \tgit branch -M master master\n '\n \n-test_expect_success 'git branch -M master2 master2 should work when master is checked out' '\n+test_expect_success 'git branch -M main2 main2 should work when master is checked out' '\n \tgit checkout master &&\n-\tgit branch master2 &&\n-\tgit branch -M master2 master2\n+\tgit branch main2 &&\n+\tgit branch -M main2 main2\n '\n \n test_expect_success 'git branch -v -d t should work' '\n@@ -324,8 +324,8 @@ test_expect_success 'git branch --list -v with --abbrev' '\n test_expect_success 'git branch --column' '\n \tCOLUMNS=81 git branch --column=column >actual &&\n \tcat >expect <<\\EOF &&\n- a/b/c bam foo l * master mb o/o q\n- abc bar j/k m/m master2 n o/p r\n+ a/b/c bam foo l main2 mb o/o q\n+ abc bar j/k m/m * master n o/p r\n EOF\n \ttest_cmp expect actual\n '\n@@ -345,8 +345,8 @@ test_expect_success 'git branch --column with an extremely long branch name' '\n j/k\n l\n m/m\n+ main2\n * master\n- master2\n mb\n n\n o/o\n@@ -365,8 +365,8 @@ test_expect_success 'git branch with column.*' '\n \tgit config --unset column.branch &&\n \tgit config --unset column.ui &&\n \tcat >expect <<\\EOF &&\n- a/b/c bam foo l * master mb o/o q\n- abc bar j/k m/m master2 n o/p r\n+ a/b/c bam foo l main2 mb o/o q\n+ abc bar j/k m/m * master n o/p r\n EOF\n \ttest_cmp expect actual\n '\n@@ -377,7 +377,7 @@ test_expect_success 'git branch --column -v should fail' '\n \n test_expect_success 'git branch -v with column.ui ignored' '\n \tgit config column.ui column &&\n-\tCOLUMNS=80 git branch -v | cut -c -10 | sed \"s/ *$//\" >actual &&\n+\tCOLUMNS=80 git branch -v | cut -c -9 | sed \"s/ *$//\" >actual &&\n \tgit config --unset column.ui &&\n \tcat >expect <<\\EOF &&\n a/b/c\n@@ -388,8 +388,8 @@ test_expect_success 'git branch -v with column.ui ignored' '\n j/k\n l\n m/m\n+ main2\n * master\n- master2\n mb\n n\n o/o\n@@ -597,10 +597,10 @@ test_expect_success 'git branch -C master master should work when master is chec\n \tgit branch -C master master\n '\n \n-test_expect_success 'git branch -C master5 master5 should work when master is checked out' '\n+test_expect_success 'git branch -C main5 main5 should work when master is checked out' '\n \tgit checkout master &&\n-\tgit branch master5 &&\n-\tgit branch -C master5 master5\n+\tgit branch main5 &&\n+\tgit branch -C main5 main5\n '\n \n test_expect_success 'git branch -C ab cd should overwrite existing config for cd' '\n@@ -711,11 +711,11 @@ test_expect_success 'deleting a self-referential symref' '\n '\n \n test_expect_success 'renaming a symref is not allowed' '\n-\tgit symbolic-ref refs/heads/master2 refs/heads/master &&\n-\ttest_must_fail git branch -m master2 master3 &&\n-\tgit symbolic-ref refs/heads/master2 &&\n+\tgit symbolic-ref refs/heads/main2 refs/heads/master &&\n+\ttest_must_fail git branch -m main2 main3 &&\n+\tgit symbolic-ref refs/heads/main2 &&\n \ttest_path_is_file .git/refs/heads/master &&\n-\ttest_path_is_missing .git/refs/heads/master3\n+\ttest_path_is_missing .git/refs/heads/main3\n '\n \n test_expect_success SYMLINKS 'git branch -m u v should fail when the reflog for u is a symlink' '\n-- \ngitgitgadget\n\n"},{"id":"405641","messageId":"a532053e6097f8a3b0f9bb5c67f56b4315ab9b96.1600279853.git.gitgitgadget@gmail.com","threadId":"54244","inReplyTo":"pull.734.git.1600279853.gitgitgadget@gmail.com","subject":"[PATCH 4/5] tests: avoid variations of the `master` branch name","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-09-16T18:10:52Z","receivedAt":"2020-09-16T18:11:24Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nThe term `master` has a loaded history that serves as a constant\nreminder of racial injustice. The Git project has no desire to\nperpetuate this and already started avoiding it.\n\nThe test suite uses variations of this name for branches other than the\ndefault one. Apart from t3200, where we just addressed this in the\nprevious commit, those instances can be renamed in an automated manner\nbecause they do not require any changes outside of the test script, so\nlet's do that.\n\nSeeing as `main` seems to be materializing as the favorite default\nbranch name of many Open Source projects, we use that name in our\nreplacements, too.\n\nThis trick was performed by this (GNU) sed invocation:\n\n\t$ sed -i 's/master\\([a-z0-9]\\)/main\\1/g' t/t*.sh\n\nSigned-off-by: Johannes Schindelin \n---\n t/t3427-rebase-subtree.sh | 42 ++++++++++++++++++------------------\n t/t4150-am.sh | 8 +++----\n t/t5515-fetch-merge-logic.sh | 6 +++---\n t/t5523-push-upstream.sh | 20 ++++++++---------\n t/t6018-rev-list-glob.sh | 6 +++---\n t/t6040-tracking-info.sh | 20 ++++++++---------\n t/t6409-merge-subtree.sh | 14 ++++++------\n 7 files changed, 58 insertions(+), 58 deletions(-)\n\ndiff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh\nindex 79e43a370b..ba27e9d603 100755\n--- a/t/t3427-rebase-subtree.sh\n+++ b/t/t3427-rebase-subtree.sh\n@@ -15,12 +15,12 @@ commit_message() {\n # this test script tries to document them. First, the following commit history\n # is generated (the onelines are shown, time flows from left to right):\n #\n-# master1 - master2 - master3\n+# main1 - main2 - main3\n # \\\n-# README ---------------------- Add subproject master - master4 - files_subtree/master5\n+# README ---------------------- Add subproject master - main4 - files_subtree/main5\n #\n # Where the merge moves the files master[123].t into the subdirectory\n-# files_subtree/ and master4 as well as files_subtree/master5 add files to that\n+# files_subtree/ and main4 as well as files_subtree/main5 add files to that\n # directory directly.\n #\n # Then, in subsequent test cases, `git filter-branch` is used to distill just\n@@ -28,11 +28,11 @@ commit_message() {\n # an empty commit is added on top. The pre-rebase commit history looks like\n # this:\n #\n-# Add subproject master - master4 - files_subtree/master5 - Empty commit\n+# Add subproject master - main4 - files_subtree/main5 - Empty commit\n #\n-# where the root commit adds three files: master1.t, master2.t and master3.t.\n+# where the root commit adds three files: main1.t, main2.t and main3.t.\n #\n-# This commit history is then rebased onto `master3` with the\n+# This commit history is then rebased onto `main3` with the\n # `-Xsubtree=files_subtree` option in three different ways:\n #\n # 1. using `--preserve-merges`\n@@ -43,9 +43,9 @@ test_expect_success 'setup' '\n \ttest_commit README &&\n \n \tgit init files &&\n-\ttest_commit -C files master1 &&\n-\ttest_commit -C files master2 &&\n-\ttest_commit -C files master3 &&\n+\ttest_commit -C files main1 &&\n+\ttest_commit -C files main2 &&\n+\ttest_commit -C files main3 &&\n \n \t: perform subtree merge into files_subtree/ &&\n \tgit fetch files refs/heads/master:refs/heads/files-master &&\n@@ -55,8 +55,8 @@ test_expect_success 'setup' '\n \tgit commit -m \"Add subproject master\" &&\n \n \t: add two extra commits to rebase &&\n-\ttest_commit -C files_subtree master4 &&\n-\ttest_commit files_subtree/master5 &&\n+\ttest_commit -C files_subtree main4 &&\n+\ttest_commit files_subtree/main5 &&\n \n \tgit checkout -b to-rebase &&\n \tgit fast-export --no-data HEAD -- files_subtree/ |\n@@ -66,22 +66,22 @@ test_expect_success 'setup' '\n \tgit commit -m \"Empty commit\" --allow-empty\n '\n \n-# FAILURE: Does not preserve master4.\n+# FAILURE: Does not preserve main4.\n test_expect_failure REBASE_P 'Rebase -Xsubtree --preserve-merges --onto commit' '\n \treset_rebase &&\n \tgit checkout -b rebase-preserve-merges to-rebase &&\n \tgit rebase -Xsubtree=files_subtree --preserve-merges --onto files-master master &&\n-\tverbose test \"$(commit_message HEAD~)\" = \"master4\" &&\n-\tverbose test \"$(commit_message HEAD)\" = \"files_subtree/master5\"\n+\tverbose test \"$(commit_message HEAD~)\" = \"main4\" &&\n+\tverbose test \"$(commit_message HEAD)\" = \"files_subtree/main5\"\n '\n \n-# FAILURE: Does not preserve master4.\n+# FAILURE: Does not preserve main4.\n test_expect_failure REBASE_P 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit' '\n \treset_rebase &&\n \tgit checkout -b rebase-keep-empty to-rebase &&\n \tgit rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master &&\n-\tverbose test \"$(commit_message HEAD~2)\" = \"master4\" &&\n-\tverbose test \"$(commit_message HEAD~)\" = \"files_subtree/master5\" &&\n+\tverbose test \"$(commit_message HEAD~2)\" = \"main4\" &&\n+\tverbose test \"$(commit_message HEAD~)\" = \"files_subtree/main5\" &&\n \tverbose test \"$(commit_message HEAD)\" = \"Empty commit\"\n '\n \n@@ -91,8 +91,8 @@ test_expect_success 'Rebase -Xsubtree --empty=ask --onto commit' '\n \ttest_must_fail git rebase -Xsubtree=files_subtree --empty=ask --onto files-master master &&\n \t: first pick results in no changes &&\n \tgit rebase --skip &&\n-\tverbose test \"$(commit_message HEAD~2)\" = \"master4\" &&\n-\tverbose test \"$(commit_message HEAD~)\" = \"files_subtree/master5\" &&\n+\tverbose test \"$(commit_message HEAD~2)\" = \"main4\" &&\n+\tverbose test \"$(commit_message HEAD~)\" = \"files_subtree/main5\" &&\n \tverbose test \"$(commit_message HEAD)\" = \"Empty commit\"\n '\n \n@@ -102,8 +102,8 @@ test_expect_success 'Rebase -Xsubtree --empty=ask --rebase-merges --onto commit'\n \ttest_must_fail git rebase -Xsubtree=files_subtree --empty=ask --rebase-merges --onto files-master --root &&\n \t: first pick results in no changes &&\n \tgit rebase --skip &&\n-\tverbose test \"$(commit_message HEAD~2)\" = \"master4\" &&\n-\tverbose test \"$(commit_message HEAD~)\" = \"files_subtree/master5\" &&\n+\tverbose test \"$(commit_message HEAD~2)\" = \"main4\" &&\n+\tverbose test \"$(commit_message HEAD~)\" = \"files_subtree/main5\" &&\n \tverbose test \"$(commit_message HEAD)\" = \"Empty commit\"\n '\n \ndiff --git a/t/t4150-am.sh b/t/t4150-am.sh\nindex 1da8ab120b..3d8dc7eb12 100755\n--- a/t/t4150-am.sh\n+++ b/t/t4150-am.sh\n@@ -465,7 +465,7 @@ test_expect_success 'am changes committer and keeps author' '\n test_expect_success 'am --signoff adds Signed-off-by: line' '\n \trm -fr .git/rebase-apply &&\n \tgit reset --hard &&\n-\tgit checkout -b master2 first &&\n+\tgit checkout -b main2 first &&\n \tgit am --signoff \\n\\n\" \\\n@@ -479,7 +479,7 @@ test_expect_success 'am --signoff adds Signed-off-by: line' '\n '\n \n test_expect_success 'am stays in branch' '\n-\techo refs/heads/master2 >expected &&\n+\techo refs/heads/main2 >expected &&\n \tgit symbolic-ref HEAD >actual &&\n \ttest_cmp expected actual\n '\n@@ -540,7 +540,7 @@ test_expect_success 'am without --keep removes Re: and [PATCH] stuff' '\n \tgit reset --hard HEAD^ &&\n \tgit am expected &&\n-\tgit rev-parse master2 >actual &&\n+\tgit rev-parse main2 >actual &&\n \ttest_cmp expected actual\n '\n \n@@ -567,7 +567,7 @@ test_expect_success 'am --keep-non-patch really keeps the non-patch part' '\n test_expect_success 'setup am -3' '\n \trm -fr .git/rebase-apply &&\n \tgit reset --hard &&\n-\tgit checkout -b base3way master2 &&\n+\tgit checkout -b base3way main2 &&\n \tsed -n -e \"3,\\$p\" msg >file &&\n \thead -n 9 msg >>file &&\n \tgit add file &&\ndiff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh\nindex 9d6a46ff56..b1c18cc993 100755\n--- a/t/t5515-fetch-merge-logic.sh\n+++ b/t/t5515-fetch-merge-logic.sh\n@@ -15,7 +15,7 @@ export GIT_TEST_PROTOCOL_VERSION\n \n build_script () {\n \tscript=\"$1\" &&\n-\tfor i in one three_file master master2 one_tree three two two2 three2\n+\tfor i in one three_file master main2 one_tree three two two2 three2\n \tdo\n \t\techo \"s/$(test_oid --hash=sha1 \"$i\")/$(test_oid \"$i\")/g\" >>\"$script\"\n \tdone\n@@ -52,8 +52,8 @@ test_expect_success setup '\n \ttwo sha1:525b7fb068d59950d185a8779dc957c77eed73ba\n \ttwo sha256:3b21de3440cd38c2a9e9b464adb923f7054949ed4c918e1a0ac4c95cd52774db\n \n-\tmaster2 sha1:754b754407bf032e9a2f9d5a9ad05ca79a6b228f\n-\tmaster2 sha256:6c7abaea8a6d8ef4d89877e68462758dc6774690fbbbb0e6d7dd57415c9abde0\n+\tmain2 sha1:754b754407bf032e9a2f9d5a9ad05ca79a6b228f\n+\tmain2 sha256:6c7abaea8a6d8ef4d89877e68462758dc6774690fbbbb0e6d7dd57415c9abde0\n \n \ttwo2 sha1:6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\n \ttwo2 sha256:87a2d3ee29c83a3dc7afd41c0606b11f67603120b910a7be7840accdc18344d4\ndiff --git a/t/t5523-push-upstream.sh b/t/t5523-push-upstream.sh\nindex c0df81a014..6b5f2e373d 100755\n--- a/t/t5523-push-upstream.sh\n+++ b/t/t5523-push-upstream.sh\n@@ -41,20 +41,20 @@ test_expect_success 'push -u --dry-run master:otherX' '\n \tcheck_config master upstream refs/heads/other\n '\n \n-test_expect_success 'push -u master2:master2' '\n-\tgit branch master2 &&\n-\tgit push -u upstream master2:master2 &&\n-\tcheck_config master2 upstream refs/heads/master2\n+test_expect_success 'push -u main2:main2' '\n+\tgit branch main2 &&\n+\tgit push -u upstream main2:main2 &&\n+\tcheck_config main2 upstream refs/heads/main2\n '\n \n-test_expect_success 'push -u master2:other2' '\n-\tgit push -u upstream master2:other2 &&\n-\tcheck_config master2 upstream refs/heads/other2\n+test_expect_success 'push -u main2:other2' '\n+\tgit push -u upstream main2:other2 &&\n+\tcheck_config main2 upstream refs/heads/other2\n '\n \n-test_expect_success 'push -u :master2' '\n-\tgit push -u upstream :master2 &&\n-\tcheck_config master2 upstream refs/heads/other2\n+test_expect_success 'push -u :main2' '\n+\tgit push -u upstream :main2 &&\n+\tcheck_config main2 upstream refs/heads/other2\n '\n \n test_expect_success 'push -u --all' '\ndiff --git a/t/t6018-rev-list-glob.sh b/t/t6018-rev-list-glob.sh\nindex b31ff7eeec..5df38a39e5 100755\n--- a/t/t6018-rev-list-glob.sh\n+++ b/t/t6018-rev-list-glob.sh\n@@ -32,11 +32,11 @@ test_expect_success 'setup' '\n \tgit checkout -b someref master &&\n \tcommit some &&\n \tgit checkout master &&\n-\tcommit master2 &&\n+\tcommit main2 &&\n \tgit tag foo/bar master &&\n-\tcommit master3 &&\n+\tcommit main3 &&\n \tgit update-ref refs/remotes/foo/baz master &&\n-\tcommit master4 &&\n+\tcommit main4 &&\n \tgit update-ref refs/remotes/upstream/one subspace/one &&\n \tgit update-ref refs/remotes/upstream/two subspace/two &&\n \tgit update-ref refs/remotes/upstream/x subspace-x &&\ndiff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh\nindex ad1922b999..946d05c879 100755\n--- a/t/t6040-tracking-info.sh\n+++ b/t/t6040-tracking-info.sh\n@@ -264,25 +264,25 @@ test_expect_success 'fail to track annotated tags' '\n test_expect_success '--set-upstream-to does not change branch' '\n \tgit branch from-master master &&\n \tgit branch --set-upstream-to master from-master &&\n-\tgit branch from-master2 master &&\n-\ttest_must_fail git config branch.from-master2.merge > actual &&\n-\tgit rev-list from-master2 &&\n-\tgit update-ref refs/heads/from-master2 from-master2^ &&\n-\tgit rev-parse from-master2 >expect2 &&\n-\tgit branch --set-upstream-to master from-master2 &&\n+\tgit branch from-main2 master &&\n+\ttest_must_fail git config branch.from-main2.merge > actual &&\n+\tgit rev-list from-main2 &&\n+\tgit update-ref refs/heads/from-main2 from-main2^ &&\n+\tgit rev-parse from-main2 >expect2 &&\n+\tgit branch --set-upstream-to master from-main2 &&\n \tgit config branch.from-master.merge > actual &&\n-\tgit rev-parse from-master2 >actual2 &&\n+\tgit rev-parse from-main2 >actual2 &&\n \tgrep -q \"^refs/heads/master$\" actual &&\n \tcmp expect2 actual2\n '\n \n test_expect_success '--set-upstream-to @{-1}' '\n \tgit checkout follower &&\n-\tgit checkout from-master2 &&\n-\tgit config branch.from-master2.merge > expect2 &&\n+\tgit checkout from-main2 &&\n+\tgit config branch.from-main2.merge > expect2 &&\n \tgit branch --set-upstream-to @{-1} from-master &&\n \tgit config branch.from-master.merge > actual &&\n-\tgit config branch.from-master2.merge > actual2 &&\n+\tgit config branch.from-main2.merge > actual2 &&\n \tgit branch --set-upstream-to follower from-master &&\n \tgit config branch.from-master.merge > expect &&\n \ttest_cmp expect2 actual2 &&\ndiff --git a/t/t6409-merge-subtree.sh b/t/t6409-merge-subtree.sh\nindex 793f0c8bf3..8189c7879e 100755\n--- a/t/t6409-merge-subtree.sh\n+++ b/t/t6409-merge-subtree.sh\n@@ -94,10 +94,10 @@ test_expect_success 'merge update' '\n \techo git-gui2 > git-gui.sh &&\n \to3=$(git hash-object git-gui.sh) &&\n \tgit add git-gui.sh &&\n-\tgit checkout -b master2 &&\n+\tgit checkout -b main2 &&\n \tgit commit -m \"update git-gui\" &&\n \tcd ../git &&\n-\tgit pull -s subtree gui master2 &&\n+\tgit pull -s subtree gui main2 &&\n \tgit ls-files -s >actual &&\n \t(\n \t\techo \"100644 $o3 0\tgit-gui/git-gui.sh\" &&\n@@ -109,7 +109,7 @@ test_expect_success 'merge update' '\n test_expect_success 'initial ambiguous subtree' '\n \tcd ../git &&\n \tgit reset --hard master &&\n-\tgit checkout -b master2 &&\n+\tgit checkout -b main2 &&\n \tgit merge -s ours --no-commit gui/master &&\n \tgit read-tree --prefix=git-gui2/ -u gui/master &&\n \tgit commit -m \"Merge git-gui2 as our subdirectory\" &&\n@@ -125,8 +125,8 @@ test_expect_success 'initial ambiguous subtree' '\n \n test_expect_success 'merge using explicit' '\n \tcd ../git &&\n-\tgit reset --hard master2 &&\n-\tgit pull -Xsubtree=git-gui gui master2 &&\n+\tgit reset --hard main2 &&\n+\tgit pull -Xsubtree=git-gui gui main2 &&\n \tgit ls-files -s >actual &&\n \t(\n \t\techo \"100644 $o3 0\tgit-gui/git-gui.sh\" &&\n@@ -138,8 +138,8 @@ test_expect_success 'merge using explicit' '\n \n test_expect_success 'merge2 using explicit' '\n \tcd ../git &&\n-\tgit reset --hard master2 &&\n-\tgit pull -Xsubtree=git-gui2 gui master2 &&\n+\tgit reset --hard main2 &&\n+\tgit pull -Xsubtree=git-gui2 gui main2 &&\n \tgit ls-files -s >actual &&\n \t(\n \t\techo \"100644 $o1 0\tgit-gui/git-gui.sh\" &&\n-- \ngitgitgadget\n\n"},{"id":"405642","messageId":"d135a8423ba1dfd4cfc1208174e18786372fcf6d.1600279853.git.gitgitgadget@gmail.com","threadId":"54244","inReplyTo":"pull.734.git.1600279853.gitgitgadget@gmail.com","subject":"[PATCH 5/5] t9902: avoid using the branch name `master`","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-09-16T18:10:53Z","receivedAt":"2020-09-16T18:11:59Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nThe completion tests used that name unnecessarily, and it is a\nnon-inclusive term, so let's avoid using it here.\n\nSigned-off-by: Johannes Schindelin \n---\n t/t9902-completion.sh | 10 +++++-----\n 1 file changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/t/t9902-completion.sh b/t/t9902-completion.sh\nindex 8425b9a531..7b7bc6e4bd 100755\n--- a/t/t9902-completion.sh\n+++ b/t/t9902-completion.sh\n@@ -542,37 +542,37 @@ test_expect_success '__gitcomp - doesnt fail because of invalid variable name' '\n '\n \n read -r -d \"\" refs <<-\\EOF\n+main\n maint\n-master\n next\n seen\n EOF\n \n test_expect_success '__gitcomp_nl - trailing space' '\n \ttest_gitcomp_nl \"m\" \"$refs\" <<-EOF\n+\tmain Z\n \tmaint Z\n-\tmaster Z\n \tEOF\n '\n \n test_expect_success '__gitcomp_nl - prefix' '\n \ttest_gitcomp_nl \"--fixup=m\" \"$refs\" \"--fixup=\" \"m\" <<-EOF\n+\t--fixup=main Z\n \t--fixup=maint Z\n-\t--fixup=master Z\n \tEOF\n '\n \n test_expect_success '__gitcomp_nl - suffix' '\n \ttest_gitcomp_nl \"branch.ma\" \"$refs\" \"branch.\" \"ma\" \".\" <<-\\EOF\n+\tbranch.main.Z\n \tbranch.maint.Z\n-\tbranch.master.Z\n \tEOF\n '\n \n test_expect_success '__gitcomp_nl - no suffix' '\n \ttest_gitcomp_nl \"ma\" \"$refs\" \"\" \"ma\" \"\" <<-\\EOF\n+\tmainZ\n \tmaintZ\n-\tmasterZ\n \tEOF\n '\n \n-- \ngitgitgadget\n"},{"id":"405643","messageId":"3b4ae48d4a3a7e2d6aae259ead19b6643d2533e8.1600279853.git.gitgitgadget@gmail.com","threadId":"54244","inReplyTo":"pull.734.git.1600279853.gitgitgadget@gmail.com","subject":"[PATCH 2/5] t/test-terminal: avoid non-inclusive language","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-09-16T18:10:50Z","receivedAt":"2020-09-16T18:12:03Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nIn the ongoing effort to make the Git project a more inclusive place,\nlet's try to avoid names like \"master\" where possible.\n\nIn this instance, the use of the term `slave` is unfortunately enshrined\nin IO::Pty's API. We simply cannot avoid using that word here. But at\nleast we can get rid of the usage of the word `master` and hope that\nIO::Pty will be eventually adjusted, too.\n\nSigned-off-by: Johannes Schindelin \n---\n t/test-terminal.perl | 32 ++++++++++++++++----------------\n 1 file changed, 16 insertions(+), 16 deletions(-)\n\ndiff --git a/t/test-terminal.perl b/t/test-terminal.perl\nindex 46bf618479..680caf48dd 100755\n--- a/t/test-terminal.perl\n+++ b/t/test-terminal.perl\n@@ -81,24 +81,24 @@ sub copy_stdio {\n \tdie \"usage: test-terminal program args\";\n }\n $ENV{TERM} = 'vt100';\n-my $master_in = new IO::Pty;\n-my $master_out = new IO::Pty;\n-my $master_err = new IO::Pty;\n-$master_in->set_raw();\n-$master_out->set_raw();\n-$master_err->set_raw();\n-$master_in->slave->set_raw();\n-$master_out->slave->set_raw();\n-$master_err->slave->set_raw();\n-my $pid = start_child(\\@ARGV, $master_in->slave, $master_out->slave, $master_err->slave);\n-close $master_in->slave;\n-close $master_out->slave;\n-close $master_err->slave;\n-my $in_pid = copy_stdin($master_in);\n-copy_stdio($master_out, $master_err);\n+my $primary_in = new IO::Pty;\n+my $primary_out = new IO::Pty;\n+my $primary_err = new IO::Pty;\n+$primary_in->set_raw();\n+$primary_out->set_raw();\n+$primary_err->set_raw();\n+$primary_in->slave->set_raw();\n+$primary_out->slave->set_raw();\n+$primary_err->slave->set_raw();\n+my $pid = start_child(\\@ARGV, $primary_in->slave, $primary_out->slave, $primary_err->slave);\n+close $primary_in->slave;\n+close $primary_out->slave;\n+close $primary_err->slave;\n+my $in_pid = copy_stdin($primary_in);\n+copy_stdio($primary_out, $primary_err);\n my $ret = finish_child($pid);\n # If the child process terminates before our copy_stdin() process is able to\n-# write all of its data to $master_in, the copy_stdin() process could stall.\n+# write all of its data to $primary_in, the copy_stdin() process could stall.\n # Send SIGTERM to it to ensure it terminates.\n kill 'TERM', $in_pid;\n finish_child($in_pid);\n-- \ngitgitgadget\n\n"},{"id":"405644","messageId":"587ddca42ae36be3d5b333cefe1f9af768bacc9a.1600279853.git.gitgitgadget@gmail.com","threadId":"54244","inReplyTo":"pull.734.git.1600279853.gitgitgadget@gmail.com","subject":"[PATCH 1/5] fast-export: avoid using unnecessary language in a code comment","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-09-16T18:10:49Z","receivedAt":"2020-09-16T18:12:09Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nIn an ongoing effort to avoid non-inclusive language, let's avoid using\nthe branch name \"master\" in a code comment.\n\nSigned-off-by: Johannes Schindelin \n---\n builtin/fast-export.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/fast-export.c b/builtin/fast-export.c\nindex 1b8fca3ee0..5527135ba8 100644\n--- a/builtin/fast-export.c\n+++ b/builtin/fast-export.c\n@@ -1026,7 +1026,7 @@ static void handle_tags_and_duplicates(struct string_list *extras)\n \t\t\t\t/*\n \t\t\t\t * Getting here means we have a commit which\n \t\t\t\t * was excluded by a negative refspec (e.g.\n-\t\t\t\t * fast-export ^master master). If we are\n+\t\t\t\t * fast-export ^HEAD HEAD). If we are\n \t\t\t\t * referencing excluded commits, set the ref\n \t\t\t\t * to the exact commit. Otherwise, the user\n \t\t\t\t * wants the branch exported but every commit\n-- \ngitgitgadget\n\n"},{"id":"405646","messageId":"pull.734.git.1600279853.gitgitgadget@gmail.com","threadId":"54244","inReplyTo":null,"subject":"[PATCH 0/5] Inclusive naming, part II","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-09-16T18:10:48Z","receivedAt":"2020-09-16T18:12:15Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"This patch series represents the logical next step on the journey begun with\nintroducing init.defaultBranch: in these patches, we avoid a couple\nunnecessary mentions of the branch name \"master\".\n\nThis patch series does not try to change the default branch name, although I\nhave that patch series ready to go. You can see the overall idea here: \nhttps://github.com/gitgitgadget/git/pull/655. Concretely, I plan on\nsubmitting three more patch series after this one:\n\n 1. a relatively small patch series to avoid using the branch name main in\n the test suite. This is necessary because my plan is to change the\n default branch name to that name, therefore it cannot be used as the\n name of a topic branch any longer.\n 2. a relatively large patch series (currently consisting of 18 patches) to\n change the default branch name to main. Most of the patches provide\n non-trivial (read: non-scriptable) adjustments to the test suite in an\n incremental fashion, with a big patch toward the end that reflects a\n fully-automated search-and-replace of all the trivial cases.\n 3. a very small patch series with fall-out patches that are not necessary\n to pass the test suite, but are still required to complete the rename\n (adjusted code comment, file rename).\n\n(Note: I am still debating whether I should move one or two patches from the\nsecond to the third patch series)\n\nJohannes Schindelin (5):\n fast-export: avoid using unnecessary language in a code comment\n t/test-terminal: avoid non-inclusive language\n t3200: avoid variations of the `master` branch name\n tests: avoid variations of the `master` branch name\n t9902: avoid using the branch name `master`\n\n builtin/fast-export.c | 2 +-\n t/t3200-branch.sh | 34 ++++++++++++++---------------\n t/t3427-rebase-subtree.sh | 42 ++++++++++++++++++------------------\n t/t4150-am.sh | 8 +++----\n t/t5515-fetch-merge-logic.sh | 6 +++---\n t/t5523-push-upstream.sh | 20 ++++++++---------\n t/t6018-rev-list-glob.sh | 6 +++---\n t/t6040-tracking-info.sh | 20 ++++++++---------\n t/t6409-merge-subtree.sh | 14 ++++++------\n t/t9902-completion.sh | 10 ++++-----\n t/test-terminal.perl | 32 +++++++++++++--------------\n 11 files changed, 97 insertions(+), 97 deletions(-)\n\n\nbase-commit: 54e85e7af1ac9e9a92888060d6811ae767fea1bc\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-734%2Fdscho%2Favoid-unnecessary-branch-name-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-734/dscho/avoid-unnecessary-branch-name-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/734\n-- \ngitgitgadget\n"},{"id":"405693","messageId":"xmqqft7hwhyd.fsf@gitster.c.googlers.com","threadId":"54244","inReplyTo":"3b4ae48d4a3a7e2d6aae259ead19b6643d2533e8.1600279853.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 2/5] t/test-terminal: avoid non-inclusive language","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-09-16T21:05:30Z","receivedAt":"2020-09-16T21:05: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> From: Johannes Schindelin \n>\n> In the ongoing effort to make the Git project a more inclusive place,\n> let's try to avoid names like \"master\" where possible.\n\nThe two sides of a PTY are called 'master' and 'slave', and I\nunderstand there is a push to move away from these words, but\ncalling one side with an invented name that is used by nobody else\nin the context of talking about PTY, while keeping the word used to\ncall the other side, would lead to confusion.\n\nA better change is to drop \"master_\" altogether without replacing\nthe word with anything, and call them just \"input\", \"output\" and\n\"error\". For those who implement the PTY, calling both ends of the\npipe 'master' vs 'slave' may be useful for them, as they are terms\nof art they are used to think with. But as end-users of PTY, the\nfact that we are holding the 'master' end, and access to the 'slave'\nend is done by asking the 'master' end we hold for the corresponding\n'slave', is not that important. What each of these three PTYs is\nused for is much more important.\n\nIf $input, $output, and $error are too terse, spell them out as\n$term_input, $term_output and $term_error or something like that,\nperhaps.\n\nThanks.\n"},{"id":"405694","messageId":"xmqqbli5whxn.fsf@gitster.c.googlers.com","threadId":"54244","inReplyTo":"587ddca42ae36be3d5b333cefe1f9af768bacc9a.1600279853.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 1/5] fast-export: avoid using unnecessary language in a code comment","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-09-16T21:05:56Z","receivedAt":"2020-09-16T21:06:54Z","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 an ongoing effort to avoid non-inclusive language, let's avoid using\n> the branch name \"master\" in a code comment.\n>\n> Signed-off-by: Johannes Schindelin \n> ---\n> builtin/fast-export.c | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/builtin/fast-export.c b/builtin/fast-export.c\n> index 1b8fca3ee0..5527135ba8 100644\n> --- a/builtin/fast-export.c\n> +++ b/builtin/fast-export.c\n> @@ -1026,7 +1026,7 @@ static void handle_tags_and_duplicates(struct string_list *extras)\n> \t\t\t\t/*\n> \t\t\t\t * Getting here means we have a commit which\n> \t\t\t\t * was excluded by a negative refspec (e.g.\n> -\t\t\t\t * fast-export ^master master). If we are\n> +\t\t\t\t * fast-export ^HEAD HEAD). If we are\n\nObviously good change. Thanks.\n\n> \t\t\t\t * referencing excluded commits, set the ref\n> \t\t\t\t * to the exact commit. Otherwise, the user\n> \t\t\t\t * wants the branch exported but every commit\n"},{"id":"405697","messageId":"xmqqo8m5v2g9.fsf@gitster.c.googlers.com","threadId":"54244","inReplyTo":"xmqqft7hwhyd.fsf@gitster.c.googlers.com","subject":"Re: [PATCH 2/5] t/test-terminal: avoid non-inclusive language","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-09-16T21:25:42Z","receivedAt":"2020-09-16T22:04:26Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n> \"Johannes Schindelin via GitGitGadget\" \n> writes:\n>\n>> From: Johannes Schindelin \n>>\n>> In the ongoing effort to make the Git project a more inclusive place,\n>> let's try to avoid names like \"master\" where possible.\n>\n> The two sides of a PTY are called 'master' and 'slave', and I\n> understand there is a push to move away from these words, but\n> calling one side with an invented name that is used by nobody else\n> in the context of talking about PTY, while keeping the word used to\n> call the other side, would lead to confusion.\n>\n> A better change is to drop \"master_\" altogether without replacing\n> the word with anything, and call them just \"input\", \"output\" and\n> \"error\".\n\nIf we really want to use a replacement word for 'master' instead of\njust dropping, I may be inclined to suggest 'parent', in the hope\nthat PTY implementors will start following what Python folks are\ndoing, at which time they will give us a synonym for 'slave' method\ncalled 'child' we can use.\n\n"},{"id":"405698","messageId":"20200916211150.GA617237@coredump.intra.peff.net","threadId":"54244","inReplyTo":"2f1d0a2df41f567bc1a8bc446c26e1cb8b6dc36c.1600279853.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 3/5] t3200: avoid variations of the `master` branch name","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2020-09-16T21:11:50Z","receivedAt":"2020-09-16T22:11:56Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Sep 16, 2020 at 06:10:51PM +0000, Johannes Schindelin via GitGitGadget wrote:\n\n> From: Johannes Schindelin \n> \n> To avoid branch names with a loaded history, we already started to avoid\n> using the name \"master\" in a couple instances.\n> \n> The `t3200-branch.sh` script uses variations of this name for branches\n> other than the default one. So let's change those names, as\n> \"lowest-hanging fruits\" in the effort to use more inclusive naming\n> throughout Git's source code.\n\nA few of these are kind of odd after only this patch. E.g.:\n\n> -test_expect_success 'git branch -M master2 master2 should work when master is checked out' '\n> +test_expect_success 'git branch -M main2 main2 should work when master is checked out' '\n> \tgit checkout master &&\n> -\tgit branch master2 &&\n> -\tgit branch -M master2 master2\n> +\tgit branch main2 &&\n> +\tgit branch -M main2 main2\n> '\n\nThe point of \"master2\" is that it wasn't \"master\". But now \"main2\" is\nkind of a weird name, because it has a \"2\" but isn't related to\nanything. If we eventually move the base branch name to \"main\", they'll\nline up again.\n\nI'm on the fence on whether this matters. It's a temporary\ninconsistency, assuming we eventually move to \"main\" as the default. We\n_could_ push this change off to that patch, too, but it does make it\nmore noisy.\n\nBut it may be that the connection to \"master\" here is not all that\nimportant in the first place. And so perhaps an even better patch (both\nat this stage and in the long run) is to give it a more descriptive\nname. If all of these could just be \"branch2\", \"branch3\", etc, then that\nalone would be better than \"master2\", IMHO. I'm not sure if the shared\n\"ma\" prefix matters, though (I know in some tests it does because we're\ntesting glob matching).\n\nAgain, I'm on the fence whether this is exploring too deeply. It's an\nopportunity to improve the tests while we're changing them. But at the\nsame time, I doubt anybody cares too much overall, so it feels a bit\nlike make-work.\n\n-Peff\n"},{"id":"405703","messageId":"xmqqft7huzju.fsf@gitster.c.googlers.com","threadId":"54244","inReplyTo":"20200916211150.GA617237@coredump.intra.peff.net","subject":"Re: [PATCH 3/5] t3200: avoid variations of the `master` branch name","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-09-16T22:28:21Z","receivedAt":"2020-09-16T22:28:34Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> I'm on the fence on whether this matters. It's a temporary\n> inconsistency, assuming we eventually move to \"main\" as the default. We\n> _could_ push this change off to that patch, too, but it does make it\n> more noisy.\n\nAnother way to handle this is perhaps to teach test-lib.sh a way to\ntell it that we want to live in the world where the initial default\nbranch name is 'main' and use that at the beginning of these select\ntest scripts like t3200. Then we can do three related things in a\nsingle patch to t3200, which are:\n\n - Declare that any \"git init\" in this test (including the initial\n one) uses 'main' as the default branch name;\n\n - rename 'master' used in the test to 'main'\n\n - rename 'master2' used in the test to 'main2'\n\nand it would eliminate the awkwardness.\n\nThe change to test-lib.sh would likely to use init.defaultBranch\nwhich also would be a good thing.\n\n"},{"id":"405704","messageId":"20200916223950.GA1207950@coredump.intra.peff.net","threadId":"54244","inReplyTo":"xmqqft7huzju.fsf@gitster.c.googlers.com","subject":"Re: [PATCH 3/5] t3200: avoid variations of the `master` branch name","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2020-09-16T22:39:50Z","receivedAt":"2020-09-16T22:40:00Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Sep 16, 2020 at 03:28:21PM -0700, Junio C Hamano wrote:\n\n> Jeff King writes:\n> \n> > I'm on the fence on whether this matters. It's a temporary\n> > inconsistency, assuming we eventually move to \"main\" as the default. We\n> > _could_ push this change off to that patch, too, but it does make it\n> > more noisy.\n> \n> Another way to handle this is perhaps to teach test-lib.sh a way to\n> tell it that we want to live in the world where the initial default\n> branch name is 'main' and use that at the beginning of these select\n> test scripts like t3200. Then we can do three related things in a\n> single patch to t3200, which are:\n> \n> - Declare that any \"git init\" in this test (including the initial\n> one) uses 'main' as the default branch name;\n> \n> - rename 'master' used in the test to 'main'\n> \n> - rename 'master2' used in the test to 'main2'\n> \n> and it would eliminate the awkwardness.\n> \n> The change to test-lib.sh would likely to use init.defaultBranch\n> which also would be a good thing.\n\nYeah, I'd be perfectly happy with that.\n\n-Peff\n"},{"id":"406071","messageId":"nycvar.QRO.7.76.6.2009201733510.5061@tvgsbejvaqbjf.bet","threadId":"54244","inReplyTo":"xmqqo8m5v2g9.fsf@gitster.c.googlers.com","subject":"Re: [PATCH 2/5] t/test-terminal: avoid non-inclusive language","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2020-09-20T15:34:05Z","receivedAt":"2020-09-21T20:54:14Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Wed, 16 Sep 2020, Junio C Hamano wrote:\n\n> Junio C Hamano writes:\n>\n> > \"Johannes Schindelin via GitGitGadget\" \n> > writes:\n> >\n> >> From: Johannes Schindelin \n> >>\n> >> In the ongoing effort to make the Git project a more inclusive place,\n> >> let's try to avoid names like \"master\" where possible.\n> >\n> > The two sides of a PTY are called 'master' and 'slave', and I\n> > understand there is a push to move away from these words, but\n> > calling one side with an invented name that is used by nobody else\n> > in the context of talking about PTY, while keeping the word used to\n> > call the other side, would lead to confusion.\n> >\n> > A better change is to drop \"master_\" altogether without replacing\n> > the word with anything, and call them just \"input\", \"output\" and\n> > \"error\".\n>\n> If we really want to use a replacement word for 'master' instead of\n> just dropping, I may be inclined to suggest 'parent', in the hope\n> that PTY implementors will start following what Python folks are\n> doing, at which time they will give us a synonym for 'slave' method\n> called 'child' we can use.\n\nGood idea!\n\nThanks,\nDscho\n"},{"id":"406073","messageId":"nycvar.QRO.7.76.6.2009201739250.5061@tvgsbejvaqbjf.bet","threadId":"54244","inReplyTo":"20200916223950.GA1207950@coredump.intra.peff.net","subject":"Re: [PATCH 3/5] t3200: avoid variations of the `master` branch name","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2020-09-20T15:43:53Z","receivedAt":"2020-09-21T20:59:07Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio & Peff,\n\nOn Wed, 16 Sep 2020, Jeff King wrote:\n\n> On Wed, Sep 16, 2020 at 03:28:21PM -0700, Junio C Hamano wrote:\n>\n> > Jeff King writes:\n> >\n> > > I'm on the fence on whether this matters. It's a temporary\n> > > inconsistency, assuming we eventually move to \"main\" as the default.\n> > > We _could_ push this change off to that patch, too, but it does make\n> > > it more noisy.\n> >\n> > Another way to handle this is perhaps to teach test-lib.sh a way to\n> > tell it that we want to live in the world where the initial default\n> > branch name is 'main' and use that at the beginning of these select\n> > test scripts like t3200. Then we can do three related things in a\n> > single patch to t3200, which are:\n> >\n> > - Declare that any \"git init\" in this test (including the initial\n> > one) uses 'main' as the default branch name;\n> >\n> > - rename 'master' used in the test to 'main'\n> >\n> > - rename 'master2' used in the test to 'main2'\n> >\n> > and it would eliminate the awkwardness.\n> >\n> > The change to test-lib.sh would likely to use init.defaultBranch\n> > which also would be a good thing.\n>\n> Yeah, I'd be perfectly happy with that.\n\nI do want to introduce something like that in the patch series after the\nnext one.\n\nHowever, in this instance, I think it makes more sense to use a separate\nname altogether. I settled for using `topic` instead of `main2`, and\n`new-topic` instead of `main3` locally.\n\nCiao,\nDscho\n"},{"id":"406075","messageId":"xmqqsgbaeswj.fsf@gitster.c.googlers.com","threadId":"54244","inReplyTo":"nycvar.QRO.7.76.6.2009201733510.5061@tvgsbejvaqbjf.bet","subject":"Re: [PATCH 2/5] t/test-terminal: avoid non-inclusive language","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-09-21T21:12:12Z","receivedAt":"2020-09-21T21:12:19Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin writes:\n\n> Hi Junio,\n>\n> On Wed, 16 Sep 2020, Junio C Hamano wrote:\n>\n>> Junio C Hamano writes:\n>>\n>> > \"Johannes Schindelin via GitGitGadget\" \n>> > writes:\n>> >\n>> >> From: Johannes Schindelin \n>> >>\n>> >> In the ongoing effort to make the Git project a more inclusive place,\n>> >> let's try to avoid names like \"master\" where possible.\n>> >\n>> > The two sides of a PTY are called 'master' and 'slave', and I\n>> > understand there is a push to move away from these words, but\n>> > calling one side with an invented name that is used by nobody else\n>> > in the context of talking about PTY, while keeping the word used to\n>> > call the other side, would lead to confusion.\n>> >\n>> > A better change is to drop \"master_\" altogether without replacing\n>> > the word with anything, and call them just \"input\", \"output\" and\n>> > \"error\".\n>>\n>> If we really want to use a replacement word for 'master' instead of\n>> just dropping, I may be inclined to suggest 'parent', in the hope\n>> that PTY implementors will start following what Python folks are\n>> doing, at which time they will give us a synonym for 'slave' method\n>> called 'child' we can use.\n>\n> Good idea!\n\nIt is unclear which one of the two you thought a good idea.\n\nHopefully both are good, but simply dropping \"master_\" without\nattempting to replace would probably be better.\n\n"},{"id":"406077","messageId":"xmqqk0wmes8g.fsf@gitster.c.googlers.com","threadId":"54244","inReplyTo":"nycvar.QRO.7.76.6.2009201739250.5061@tvgsbejvaqbjf.bet","subject":"Re: [PATCH 3/5] t3200: avoid variations of the `master` branch name","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-09-21T21:26:39Z","receivedAt":"2020-09-21T21:26:46Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin writes:\n\n>> > Jeff King writes:\n>> >\n>> > > I'm on the fence on whether this matters. It's a temporary\n>> > > inconsistency, assuming we eventually move to \"main\" as the default.\n>> > > We _could_ push this change off to that patch, too, but it does make\n>> > > it more noisy.\n>> > ...\n> However, in this instance, I think it makes more sense to use a separate\n> name altogether. I settled for using `topic` instead of `main2`, and\n> `new-topic` instead of `main3` locally.\n\nI think that is sensible. Configuration does not have to be used as\nan escape hatch to make 'main2' less awkward---if we can avoid\n'main2' (or 'master2'), that would be sufficient.\n\n"},{"id":"406080","messageId":"pull.734.v2.git.1600725687.gitgitgadget@gmail.com","threadId":"54244","inReplyTo":"pull.734.git.1600279853.gitgitgadget@gmail.com","subject":"[PATCH v2 0/5] Inclusive naming, part II","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-09-21T22:01:21Z","receivedAt":"2020-09-21T22:01:32Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"This patch series represents the logical next step on the journey begun with\nintroducing init.defaultBranch: in these patches, we avoid a couple\nunnecessary mentions of the branch name \"master\".\n\nThis patch series does not try to change the default branch name, although I\nhave that patch series ready to go. You can see the overall idea here: \nhttps://github.com/gitgitgadget/git/pull/655. Concretely, I plan on\nsubmitting three more patch series after this one:\n\n 1. a relatively small patch series to avoid using the branch name main in\n the test suite. This is necessary because my plan is to change the\n default branch name to that name, therefore it cannot be used as the\n name of a topic branch any longer.\n 2. a relatively large patch series (currently consisting of 18 patches) to\n change the default branch name to main. Most of the patches provide\n non-trivial (read: non-scriptable) adjustments to the test suite in an\n incremental fashion, with a big patch toward the end that reflects a\n fully-automated search-and-replace of all the trivial cases.\n 3. a very small patch series with fall-out patches that are not necessary\n to pass the test suite, but are still required to complete the rename\n (adjusted code comment, file rename).\n\n(Note: I am still debating whether I should move one or two patches from the\nsecond to the third patch series)\n\nChanges since v1:\n\n * Instead of using the name primary for the adjustments to \n t/test-terminal.perl, we follow Python's lead (which uses the\n parent/child nomenclature).\n * The changes to t3200 no longer use variations of the name main as branch\n names; Instead, the renamed branches are independent from any current or\n future default branch name.\n\nJohannes Schindelin (5):\n fast-export: avoid using unnecessary language in a code comment\n t/test-terminal: avoid non-inclusive language\n t3200: avoid variations of the `master` branch name\n tests: avoid variations of the `master` branch name\n t9902: avoid using the branch name `master`\n\n builtin/fast-export.c | 2 +-\n t/t3200-branch.sh | 34 ++++++++++++++---------------\n t/t3427-rebase-subtree.sh | 42 ++++++++++++++++++------------------\n t/t4150-am.sh | 8 +++----\n t/t5515-fetch-merge-logic.sh | 6 +++---\n t/t5523-push-upstream.sh | 20 ++++++++---------\n t/t6018-rev-list-glob.sh | 6 +++---\n t/t6040-tracking-info.sh | 20 ++++++++---------\n t/t6409-merge-subtree.sh | 14 ++++++------\n t/t9902-completion.sh | 10 ++++-----\n t/test-terminal.perl | 32 +++++++++++++--------------\n 11 files changed, 97 insertions(+), 97 deletions(-)\n\n\nbase-commit: 54e85e7af1ac9e9a92888060d6811ae767fea1bc\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-734%2Fdscho%2Favoid-unnecessary-branch-name-v2\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-734/dscho/avoid-unnecessary-branch-name-v2\nPull-Request: https://github.com/gitgitgadget/git/pull/734\n\nRange-diff vs v1:\n\n 1: 587ddca42a = 1: 587ddca42a fast-export: avoid using unnecessary language in a code comment\n 2: 3b4ae48d4a ! 2: 80e1d46cce t/test-terminal: avoid non-inclusive language\n @@ Commit message\n least we can get rid of the usage of the word `master` and hope that\n IO::Pty will be eventually adjusted, too.\n \n + Guessing that IO::Pty might follow Python's lead, we replace the name\n + `master` by `parent` (hoping that IO::Pty will adopt the parent/child\n + nomenclature, too).\n +\n Signed-off-by: Johannes Schindelin \n \n ## t/test-terminal.perl ##\n @@ t/test-terminal.perl: sub copy_stdio {\n -close $master_err->slave;\n -my $in_pid = copy_stdin($master_in);\n -copy_stdio($master_out, $master_err);\n -+my $primary_in = new IO::Pty;\n -+my $primary_out = new IO::Pty;\n -+my $primary_err = new IO::Pty;\n -+$primary_in->set_raw();\n -+$primary_out->set_raw();\n -+$primary_err->set_raw();\n -+$primary_in->slave->set_raw();\n -+$primary_out->slave->set_raw();\n -+$primary_err->slave->set_raw();\n -+my $pid = start_child(\\@ARGV, $primary_in->slave, $primary_out->slave, $primary_err->slave);\n -+close $primary_in->slave;\n -+close $primary_out->slave;\n -+close $primary_err->slave;\n -+my $in_pid = copy_stdin($primary_in);\n -+copy_stdio($primary_out, $primary_err);\n ++my $parent_in = new IO::Pty;\n ++my $parent_out = new IO::Pty;\n ++my $parent_err = new IO::Pty;\n ++$parent_in->set_raw();\n ++$parent_out->set_raw();\n ++$parent_err->set_raw();\n ++$parent_in->slave->set_raw();\n ++$parent_out->slave->set_raw();\n ++$parent_err->slave->set_raw();\n ++my $pid = start_child(\\@ARGV, $parent_in->slave, $parent_out->slave, $parent_err->slave);\n ++close $parent_in->slave;\n ++close $parent_out->slave;\n ++close $parent_err->slave;\n ++my $in_pid = copy_stdin($parent_in);\n ++copy_stdio($parent_out, $parent_err);\n my $ret = finish_child($pid);\n # If the child process terminates before our copy_stdin() process is able to\n -# write all of its data to $master_in, the copy_stdin() process could stall.\n -+# write all of its data to $primary_in, the copy_stdin() process could stall.\n ++# write all of its data to $parent_in, the copy_stdin() process could stall.\n # Send SIGTERM to it to ensure it terminates.\n kill 'TERM', $in_pid;\n finish_child($in_pid);\n 3: 2f1d0a2df4 ! 3: 8d8e9abfe2 t3200: avoid variations of the `master` branch name\n @@ Commit message\n The `t3200-branch.sh` script uses variations of this name for branches\n other than the default one. So let's change those names, as\n \"lowest-hanging fruits\" in the effort to use more inclusive naming\n - throughout Git's source code.\n + throughout Git's source code. While at it, make those branch names\n + independent from the default branch name.\n \n - In this particular instance, this requires a couple of non-trivial\n - adjustments, as the aligned output depends on the maximum length of the\n - displayed branches (which we now changed), and also on the alphabetical\n - order (which we now changed, too).\n + In this particular instance, this rename requires a couple of\n + non-trivial adjustments, as the aligned output depends on the maximum\n + length of the displayed branches (which we now changed), and also on the\n + alphabetical order (which we now changed, too).\n \n Signed-off-by: Johannes Schindelin \n \n @@ t/t3200-branch.sh: test_expect_success 'git branch -M master master should work\n '\n \n -test_expect_success 'git branch -M master2 master2 should work when master is checked out' '\n -+test_expect_success 'git branch -M main2 main2 should work when master is checked out' '\n ++test_expect_success 'git branch -M topic topic should work when master is checked out' '\n \tgit checkout master &&\n -\tgit branch master2 &&\n -\tgit branch -M master2 master2\n -+\tgit branch main2 &&\n -+\tgit branch -M main2 main2\n ++\tgit branch topic &&\n ++\tgit branch -M topic topic\n '\n \n test_expect_success 'git branch -v -d t should work' '\n @@ t/t3200-branch.sh: test_expect_success 'git branch --list -v with --abbrev' '\n \tcat >expect <<\\EOF &&\n - a/b/c bam foo l * master mb o/o q\n - abc bar j/k m/m master2 n o/p r\n -+ a/b/c bam foo l main2 mb o/o q\n -+ abc bar j/k m/m * master n o/p r\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 EOF\n \ttest_cmp expect actual\n '\n @@ t/t3200-branch.sh: test_expect_success 'git branch --column with an extremely long branch name' '\n - j/k\n l\n m/m\n -+ main2\n * master\n - master2\n mb\n n\n o/o\n + o/p\n + q\n + r\n ++ topic\n + $long\n + EOF\n + \ttest_cmp expect actual\n @@ t/t3200-branch.sh: test_expect_success 'git branch with column.*' '\n \tgit config --unset column.branch &&\n \tgit config --unset column.ui &&\n \tcat >expect <<\\EOF &&\n - a/b/c bam foo l * master mb o/o q\n - abc bar j/k m/m master2 n o/p r\n -+ a/b/c bam foo l main2 mb o/o q\n -+ abc bar j/k m/m * master n o/p r\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 EOF\n \ttest_cmp expect actual\n '\n @@ t/t3200-branch.sh: test_expect_success 'git branch --column -v should fail' '\n \tcat >expect <<\\EOF &&\n a/b/c\n @@ t/t3200-branch.sh: test_expect_success 'git branch -v with column.ui ignored' '\n - j/k\n l\n m/m\n -+ main2\n * master\n - master2\n mb\n n\n o/o\n + o/p\n + q\n + r\n ++ topic\n + EOF\n + \ttest_cmp expect actual\n + '\n @@ t/t3200-branch.sh: test_expect_success 'git branch -C master master should work when master is chec\n \tgit branch -C master master\n '\n @@ t/t3200-branch.sh: test_expect_success 'deleting a self-referential symref' '\n -\tgit symbolic-ref refs/heads/master2 refs/heads/master &&\n -\ttest_must_fail git branch -m master2 master3 &&\n -\tgit symbolic-ref refs/heads/master2 &&\n -+\tgit symbolic-ref refs/heads/main2 refs/heads/master &&\n -+\ttest_must_fail git branch -m main2 main3 &&\n -+\tgit symbolic-ref refs/heads/main2 &&\n ++\tgit symbolic-ref refs/heads/topic refs/heads/master &&\n ++\ttest_must_fail git branch -m topic new-topic &&\n ++\tgit symbolic-ref refs/heads/topic &&\n \ttest_path_is_file .git/refs/heads/master &&\n -\ttest_path_is_missing .git/refs/heads/master3\n -+\ttest_path_is_missing .git/refs/heads/main3\n ++\ttest_path_is_missing .git/refs/heads/new-topic\n '\n \n test_expect_success SYMLINKS 'git branch -m u v should fail when the reflog for u is a symlink' '\n 4: a532053e60 = 4: 8f59e19b95 tests: avoid variations of the `master` branch name\n 5: d135a8423b = 5: c2c1238b5d t9902: avoid using the branch name `master`\n\n-- \ngitgitgadget\n"},{"id":"406081","messageId":"587ddca42ae36be3d5b333cefe1f9af768bacc9a.1600725687.git.gitgitgadget@gmail.com","threadId":"54244","inReplyTo":"pull.734.v2.git.1600725687.gitgitgadget@gmail.com","subject":"[PATCH v2 1/5] fast-export: avoid using unnecessary language in a code comment","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-09-21T22:01:22Z","receivedAt":"2020-09-21T22:01:33Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nIn an ongoing effort to avoid non-inclusive language, let's avoid using\nthe branch name \"master\" in a code comment.\n\nSigned-off-by: Johannes Schindelin \n---\n builtin/fast-export.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/fast-export.c b/builtin/fast-export.c\nindex 1b8fca3ee0..5527135ba8 100644\n--- a/builtin/fast-export.c\n+++ b/builtin/fast-export.c\n@@ -1026,7 +1026,7 @@ static void handle_tags_and_duplicates(struct string_list *extras)\n \t\t\t\t/*\n \t\t\t\t * Getting here means we have a commit which\n \t\t\t\t * was excluded by a negative refspec (e.g.\n-\t\t\t\t * fast-export ^master master). If we are\n+\t\t\t\t * fast-export ^HEAD HEAD). If we are\n \t\t\t\t * referencing excluded commits, set the ref\n \t\t\t\t * to the exact commit. Otherwise, the user\n \t\t\t\t * wants the branch exported but every commit\n-- \ngitgitgadget\n\n"},{"id":"406082","messageId":"8d8e9abfe2ad141a75ee54446393f8b54b1fb990.1600725687.git.gitgitgadget@gmail.com","threadId":"54244","inReplyTo":"pull.734.v2.git.1600725687.gitgitgadget@gmail.com","subject":"[PATCH v2 3/5] t3200: avoid variations of the `master` branch name","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-09-21T22:01:24Z","receivedAt":"2020-09-21T22:01:35Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nTo avoid branch names with a loaded history, we already started to avoid\nusing the name \"master\" in a couple instances.\n\nThe `t3200-branch.sh` script uses variations of this name for branches\nother than the default one. So let's change those names, as\n\"lowest-hanging fruits\" in the effort to use more inclusive naming\nthroughout Git's source code. While at it, make those branch names\nindependent from the default branch name.\n\nIn this particular instance, this rename requires a couple of\nnon-trivial adjustments, as the aligned output depends on the maximum\nlength of the displayed branches (which we now changed), and also on the\nalphabetical order (which we now changed, too).\n\nSigned-off-by: Johannes Schindelin \n---\n t/t3200-branch.sh | 34 +++++++++++++++++-----------------\n 1 file changed, 17 insertions(+), 17 deletions(-)\n\ndiff --git a/t/t3200-branch.sh b/t/t3200-branch.sh\nindex 4c0734157b..cc27e3bfdb 100755\n--- a/t/t3200-branch.sh\n+++ b/t/t3200-branch.sh\n@@ -234,10 +234,10 @@ test_expect_success 'git branch -M master master should work when master is chec\n \tgit branch -M master master\n '\n \n-test_expect_success 'git branch -M master2 master2 should work when master is checked out' '\n+test_expect_success 'git branch -M topic topic should work when master is checked out' '\n \tgit checkout master &&\n-\tgit branch master2 &&\n-\tgit branch -M master2 master2\n+\tgit branch topic &&\n+\tgit branch -M topic topic\n '\n \n test_expect_success 'git branch -v -d t should work' '\n@@ -324,8 +324,8 @@ test_expect_success 'git branch --list -v with --abbrev' '\n test_expect_success 'git branch --column' '\n \tCOLUMNS=81 git branch --column=column >actual &&\n \tcat >expect <<\\EOF &&\n- a/b/c bam foo l * master mb o/o q\n- abc bar j/k m/m master2 n o/p r\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 EOF\n \ttest_cmp expect actual\n '\n@@ -346,13 +346,13 @@ test_expect_success 'git branch --column with an extremely long branch name' '\n l\n m/m\n * master\n- master2\n mb\n n\n o/o\n o/p\n q\n r\n+ topic\n $long\n EOF\n \ttest_cmp expect actual\n@@ -365,8 +365,8 @@ test_expect_success 'git branch with column.*' '\n \tgit config --unset column.branch &&\n \tgit config --unset column.ui &&\n \tcat >expect <<\\EOF &&\n- a/b/c bam foo l * master mb o/o q\n- abc bar j/k m/m master2 n o/p r\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 EOF\n \ttest_cmp expect actual\n '\n@@ -377,7 +377,7 @@ test_expect_success 'git branch --column -v should fail' '\n \n test_expect_success 'git branch -v with column.ui ignored' '\n \tgit config column.ui column &&\n-\tCOLUMNS=80 git branch -v | cut -c -10 | sed \"s/ *$//\" >actual &&\n+\tCOLUMNS=80 git branch -v | cut -c -9 | sed \"s/ *$//\" >actual &&\n \tgit config --unset column.ui &&\n \tcat >expect <<\\EOF &&\n a/b/c\n@@ -389,13 +389,13 @@ test_expect_success 'git branch -v with column.ui ignored' '\n l\n m/m\n * master\n- master2\n mb\n n\n o/o\n o/p\n q\n r\n+ topic\n EOF\n \ttest_cmp expect actual\n '\n@@ -597,10 +597,10 @@ test_expect_success 'git branch -C master master should work when master is chec\n \tgit branch -C master master\n '\n \n-test_expect_success 'git branch -C master5 master5 should work when master is checked out' '\n+test_expect_success 'git branch -C main5 main5 should work when master is checked out' '\n \tgit checkout master &&\n-\tgit branch master5 &&\n-\tgit branch -C master5 master5\n+\tgit branch main5 &&\n+\tgit branch -C main5 main5\n '\n \n test_expect_success 'git branch -C ab cd should overwrite existing config for cd' '\n@@ -711,11 +711,11 @@ test_expect_success 'deleting a self-referential symref' '\n '\n \n test_expect_success 'renaming a symref is not allowed' '\n-\tgit symbolic-ref refs/heads/master2 refs/heads/master &&\n-\ttest_must_fail git branch -m master2 master3 &&\n-\tgit symbolic-ref refs/heads/master2 &&\n+\tgit symbolic-ref refs/heads/topic refs/heads/master &&\n+\ttest_must_fail git branch -m topic new-topic &&\n+\tgit symbolic-ref refs/heads/topic &&\n \ttest_path_is_file .git/refs/heads/master &&\n-\ttest_path_is_missing .git/refs/heads/master3\n+\ttest_path_is_missing .git/refs/heads/new-topic\n '\n \n test_expect_success SYMLINKS 'git branch -m u v should fail when the reflog for u is a symlink' '\n-- \ngitgitgadget\n\n"},{"id":"406083","messageId":"8f59e19b9562f2673c4fab5509ad8e8e2d48c19c.1600725687.git.gitgitgadget@gmail.com","threadId":"54244","inReplyTo":"pull.734.v2.git.1600725687.gitgitgadget@gmail.com","subject":"[PATCH v2 4/5] tests: avoid variations of the `master` branch name","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-09-21T22:01:25Z","receivedAt":"2020-09-21T22:01:36Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nThe term `master` has a loaded history that serves as a constant\nreminder of racial injustice. The Git project has no desire to\nperpetuate this and already started avoiding it.\n\nThe test suite uses variations of this name for branches other than the\ndefault one. Apart from t3200, where we just addressed this in the\nprevious commit, those instances can be renamed in an automated manner\nbecause they do not require any changes outside of the test script, so\nlet's do that.\n\nSeeing as `main` seems to be materializing as the favorite default\nbranch name of many Open Source projects, we use that name in our\nreplacements, too.\n\nThis trick was performed by this (GNU) sed invocation:\n\n\t$ sed -i 's/master\\([a-z0-9]\\)/main\\1/g' t/t*.sh\n\nSigned-off-by: Johannes Schindelin \n---\n t/t3427-rebase-subtree.sh | 42 ++++++++++++++++++------------------\n t/t4150-am.sh | 8 +++----\n t/t5515-fetch-merge-logic.sh | 6 +++---\n t/t5523-push-upstream.sh | 20 ++++++++---------\n t/t6018-rev-list-glob.sh | 6 +++---\n t/t6040-tracking-info.sh | 20 ++++++++---------\n t/t6409-merge-subtree.sh | 14 ++++++------\n 7 files changed, 58 insertions(+), 58 deletions(-)\n\ndiff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh\nindex 79e43a370b..ba27e9d603 100755\n--- a/t/t3427-rebase-subtree.sh\n+++ b/t/t3427-rebase-subtree.sh\n@@ -15,12 +15,12 @@ commit_message() {\n # this test script tries to document them. First, the following commit history\n # is generated (the onelines are shown, time flows from left to right):\n #\n-# master1 - master2 - master3\n+# main1 - main2 - main3\n # \\\n-# README ---------------------- Add subproject master - master4 - files_subtree/master5\n+# README ---------------------- Add subproject master - main4 - files_subtree/main5\n #\n # Where the merge moves the files master[123].t into the subdirectory\n-# files_subtree/ and master4 as well as files_subtree/master5 add files to that\n+# files_subtree/ and main4 as well as files_subtree/main5 add files to that\n # directory directly.\n #\n # Then, in subsequent test cases, `git filter-branch` is used to distill just\n@@ -28,11 +28,11 @@ commit_message() {\n # an empty commit is added on top. The pre-rebase commit history looks like\n # this:\n #\n-# Add subproject master - master4 - files_subtree/master5 - Empty commit\n+# Add subproject master - main4 - files_subtree/main5 - Empty commit\n #\n-# where the root commit adds three files: master1.t, master2.t and master3.t.\n+# where the root commit adds three files: main1.t, main2.t and main3.t.\n #\n-# This commit history is then rebased onto `master3` with the\n+# This commit history is then rebased onto `main3` with the\n # `-Xsubtree=files_subtree` option in three different ways:\n #\n # 1. using `--preserve-merges`\n@@ -43,9 +43,9 @@ test_expect_success 'setup' '\n \ttest_commit README &&\n \n \tgit init files &&\n-\ttest_commit -C files master1 &&\n-\ttest_commit -C files master2 &&\n-\ttest_commit -C files master3 &&\n+\ttest_commit -C files main1 &&\n+\ttest_commit -C files main2 &&\n+\ttest_commit -C files main3 &&\n \n \t: perform subtree merge into files_subtree/ &&\n \tgit fetch files refs/heads/master:refs/heads/files-master &&\n@@ -55,8 +55,8 @@ test_expect_success 'setup' '\n \tgit commit -m \"Add subproject master\" &&\n \n \t: add two extra commits to rebase &&\n-\ttest_commit -C files_subtree master4 &&\n-\ttest_commit files_subtree/master5 &&\n+\ttest_commit -C files_subtree main4 &&\n+\ttest_commit files_subtree/main5 &&\n \n \tgit checkout -b to-rebase &&\n \tgit fast-export --no-data HEAD -- files_subtree/ |\n@@ -66,22 +66,22 @@ test_expect_success 'setup' '\n \tgit commit -m \"Empty commit\" --allow-empty\n '\n \n-# FAILURE: Does not preserve master4.\n+# FAILURE: Does not preserve main4.\n test_expect_failure REBASE_P 'Rebase -Xsubtree --preserve-merges --onto commit' '\n \treset_rebase &&\n \tgit checkout -b rebase-preserve-merges to-rebase &&\n \tgit rebase -Xsubtree=files_subtree --preserve-merges --onto files-master master &&\n-\tverbose test \"$(commit_message HEAD~)\" = \"master4\" &&\n-\tverbose test \"$(commit_message HEAD)\" = \"files_subtree/master5\"\n+\tverbose test \"$(commit_message HEAD~)\" = \"main4\" &&\n+\tverbose test \"$(commit_message HEAD)\" = \"files_subtree/main5\"\n '\n \n-# FAILURE: Does not preserve master4.\n+# FAILURE: Does not preserve main4.\n test_expect_failure REBASE_P 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit' '\n \treset_rebase &&\n \tgit checkout -b rebase-keep-empty to-rebase &&\n \tgit rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master &&\n-\tverbose test \"$(commit_message HEAD~2)\" = \"master4\" &&\n-\tverbose test \"$(commit_message HEAD~)\" = \"files_subtree/master5\" &&\n+\tverbose test \"$(commit_message HEAD~2)\" = \"main4\" &&\n+\tverbose test \"$(commit_message HEAD~)\" = \"files_subtree/main5\" &&\n \tverbose test \"$(commit_message HEAD)\" = \"Empty commit\"\n '\n \n@@ -91,8 +91,8 @@ test_expect_success 'Rebase -Xsubtree --empty=ask --onto commit' '\n \ttest_must_fail git rebase -Xsubtree=files_subtree --empty=ask --onto files-master master &&\n \t: first pick results in no changes &&\n \tgit rebase --skip &&\n-\tverbose test \"$(commit_message HEAD~2)\" = \"master4\" &&\n-\tverbose test \"$(commit_message HEAD~)\" = \"files_subtree/master5\" &&\n+\tverbose test \"$(commit_message HEAD~2)\" = \"main4\" &&\n+\tverbose test \"$(commit_message HEAD~)\" = \"files_subtree/main5\" &&\n \tverbose test \"$(commit_message HEAD)\" = \"Empty commit\"\n '\n \n@@ -102,8 +102,8 @@ test_expect_success 'Rebase -Xsubtree --empty=ask --rebase-merges --onto commit'\n \ttest_must_fail git rebase -Xsubtree=files_subtree --empty=ask --rebase-merges --onto files-master --root &&\n \t: first pick results in no changes &&\n \tgit rebase --skip &&\n-\tverbose test \"$(commit_message HEAD~2)\" = \"master4\" &&\n-\tverbose test \"$(commit_message HEAD~)\" = \"files_subtree/master5\" &&\n+\tverbose test \"$(commit_message HEAD~2)\" = \"main4\" &&\n+\tverbose test \"$(commit_message HEAD~)\" = \"files_subtree/main5\" &&\n \tverbose test \"$(commit_message HEAD)\" = \"Empty commit\"\n '\n \ndiff --git a/t/t4150-am.sh b/t/t4150-am.sh\nindex 1da8ab120b..3d8dc7eb12 100755\n--- a/t/t4150-am.sh\n+++ b/t/t4150-am.sh\n@@ -465,7 +465,7 @@ test_expect_success 'am changes committer and keeps author' '\n test_expect_success 'am --signoff adds Signed-off-by: line' '\n \trm -fr .git/rebase-apply &&\n \tgit reset --hard &&\n-\tgit checkout -b master2 first &&\n+\tgit checkout -b main2 first &&\n \tgit am --signoff \\n\\n\" \\\n@@ -479,7 +479,7 @@ test_expect_success 'am --signoff adds Signed-off-by: line' '\n '\n \n test_expect_success 'am stays in branch' '\n-\techo refs/heads/master2 >expected &&\n+\techo refs/heads/main2 >expected &&\n \tgit symbolic-ref HEAD >actual &&\n \ttest_cmp expected actual\n '\n@@ -540,7 +540,7 @@ test_expect_success 'am without --keep removes Re: and [PATCH] stuff' '\n \tgit reset --hard HEAD^ &&\n \tgit am expected &&\n-\tgit rev-parse master2 >actual &&\n+\tgit rev-parse main2 >actual &&\n \ttest_cmp expected actual\n '\n \n@@ -567,7 +567,7 @@ test_expect_success 'am --keep-non-patch really keeps the non-patch part' '\n test_expect_success 'setup am -3' '\n \trm -fr .git/rebase-apply &&\n \tgit reset --hard &&\n-\tgit checkout -b base3way master2 &&\n+\tgit checkout -b base3way main2 &&\n \tsed -n -e \"3,\\$p\" msg >file &&\n \thead -n 9 msg >>file &&\n \tgit add file &&\ndiff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh\nindex 9d6a46ff56..b1c18cc993 100755\n--- a/t/t5515-fetch-merge-logic.sh\n+++ b/t/t5515-fetch-merge-logic.sh\n@@ -15,7 +15,7 @@ export GIT_TEST_PROTOCOL_VERSION\n \n build_script () {\n \tscript=\"$1\" &&\n-\tfor i in one three_file master master2 one_tree three two two2 three2\n+\tfor i in one three_file master main2 one_tree three two two2 three2\n \tdo\n \t\techo \"s/$(test_oid --hash=sha1 \"$i\")/$(test_oid \"$i\")/g\" >>\"$script\"\n \tdone\n@@ -52,8 +52,8 @@ test_expect_success setup '\n \ttwo sha1:525b7fb068d59950d185a8779dc957c77eed73ba\n \ttwo sha256:3b21de3440cd38c2a9e9b464adb923f7054949ed4c918e1a0ac4c95cd52774db\n \n-\tmaster2 sha1:754b754407bf032e9a2f9d5a9ad05ca79a6b228f\n-\tmaster2 sha256:6c7abaea8a6d8ef4d89877e68462758dc6774690fbbbb0e6d7dd57415c9abde0\n+\tmain2 sha1:754b754407bf032e9a2f9d5a9ad05ca79a6b228f\n+\tmain2 sha256:6c7abaea8a6d8ef4d89877e68462758dc6774690fbbbb0e6d7dd57415c9abde0\n \n \ttwo2 sha1:6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\n \ttwo2 sha256:87a2d3ee29c83a3dc7afd41c0606b11f67603120b910a7be7840accdc18344d4\ndiff --git a/t/t5523-push-upstream.sh b/t/t5523-push-upstream.sh\nindex c0df81a014..6b5f2e373d 100755\n--- a/t/t5523-push-upstream.sh\n+++ b/t/t5523-push-upstream.sh\n@@ -41,20 +41,20 @@ test_expect_success 'push -u --dry-run master:otherX' '\n \tcheck_config master upstream refs/heads/other\n '\n \n-test_expect_success 'push -u master2:master2' '\n-\tgit branch master2 &&\n-\tgit push -u upstream master2:master2 &&\n-\tcheck_config master2 upstream refs/heads/master2\n+test_expect_success 'push -u main2:main2' '\n+\tgit branch main2 &&\n+\tgit push -u upstream main2:main2 &&\n+\tcheck_config main2 upstream refs/heads/main2\n '\n \n-test_expect_success 'push -u master2:other2' '\n-\tgit push -u upstream master2:other2 &&\n-\tcheck_config master2 upstream refs/heads/other2\n+test_expect_success 'push -u main2:other2' '\n+\tgit push -u upstream main2:other2 &&\n+\tcheck_config main2 upstream refs/heads/other2\n '\n \n-test_expect_success 'push -u :master2' '\n-\tgit push -u upstream :master2 &&\n-\tcheck_config master2 upstream refs/heads/other2\n+test_expect_success 'push -u :main2' '\n+\tgit push -u upstream :main2 &&\n+\tcheck_config main2 upstream refs/heads/other2\n '\n \n test_expect_success 'push -u --all' '\ndiff --git a/t/t6018-rev-list-glob.sh b/t/t6018-rev-list-glob.sh\nindex b31ff7eeec..5df38a39e5 100755\n--- a/t/t6018-rev-list-glob.sh\n+++ b/t/t6018-rev-list-glob.sh\n@@ -32,11 +32,11 @@ test_expect_success 'setup' '\n \tgit checkout -b someref master &&\n \tcommit some &&\n \tgit checkout master &&\n-\tcommit master2 &&\n+\tcommit main2 &&\n \tgit tag foo/bar master &&\n-\tcommit master3 &&\n+\tcommit main3 &&\n \tgit update-ref refs/remotes/foo/baz master &&\n-\tcommit master4 &&\n+\tcommit main4 &&\n \tgit update-ref refs/remotes/upstream/one subspace/one &&\n \tgit update-ref refs/remotes/upstream/two subspace/two &&\n \tgit update-ref refs/remotes/upstream/x subspace-x &&\ndiff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh\nindex ad1922b999..946d05c879 100755\n--- a/t/t6040-tracking-info.sh\n+++ b/t/t6040-tracking-info.sh\n@@ -264,25 +264,25 @@ test_expect_success 'fail to track annotated tags' '\n test_expect_success '--set-upstream-to does not change branch' '\n \tgit branch from-master master &&\n \tgit branch --set-upstream-to master from-master &&\n-\tgit branch from-master2 master &&\n-\ttest_must_fail git config branch.from-master2.merge > actual &&\n-\tgit rev-list from-master2 &&\n-\tgit update-ref refs/heads/from-master2 from-master2^ &&\n-\tgit rev-parse from-master2 >expect2 &&\n-\tgit branch --set-upstream-to master from-master2 &&\n+\tgit branch from-main2 master &&\n+\ttest_must_fail git config branch.from-main2.merge > actual &&\n+\tgit rev-list from-main2 &&\n+\tgit update-ref refs/heads/from-main2 from-main2^ &&\n+\tgit rev-parse from-main2 >expect2 &&\n+\tgit branch --set-upstream-to master from-main2 &&\n \tgit config branch.from-master.merge > actual &&\n-\tgit rev-parse from-master2 >actual2 &&\n+\tgit rev-parse from-main2 >actual2 &&\n \tgrep -q \"^refs/heads/master$\" actual &&\n \tcmp expect2 actual2\n '\n \n test_expect_success '--set-upstream-to @{-1}' '\n \tgit checkout follower &&\n-\tgit checkout from-master2 &&\n-\tgit config branch.from-master2.merge > expect2 &&\n+\tgit checkout from-main2 &&\n+\tgit config branch.from-main2.merge > expect2 &&\n \tgit branch --set-upstream-to @{-1} from-master &&\n \tgit config branch.from-master.merge > actual &&\n-\tgit config branch.from-master2.merge > actual2 &&\n+\tgit config branch.from-main2.merge > actual2 &&\n \tgit branch --set-upstream-to follower from-master &&\n \tgit config branch.from-master.merge > expect &&\n \ttest_cmp expect2 actual2 &&\ndiff --git a/t/t6409-merge-subtree.sh b/t/t6409-merge-subtree.sh\nindex 793f0c8bf3..8189c7879e 100755\n--- a/t/t6409-merge-subtree.sh\n+++ b/t/t6409-merge-subtree.sh\n@@ -94,10 +94,10 @@ test_expect_success 'merge update' '\n \techo git-gui2 > git-gui.sh &&\n \to3=$(git hash-object git-gui.sh) &&\n \tgit add git-gui.sh &&\n-\tgit checkout -b master2 &&\n+\tgit checkout -b main2 &&\n \tgit commit -m \"update git-gui\" &&\n \tcd ../git &&\n-\tgit pull -s subtree gui master2 &&\n+\tgit pull -s subtree gui main2 &&\n \tgit ls-files -s >actual &&\n \t(\n \t\techo \"100644 $o3 0\tgit-gui/git-gui.sh\" &&\n@@ -109,7 +109,7 @@ test_expect_success 'merge update' '\n test_expect_success 'initial ambiguous subtree' '\n \tcd ../git &&\n \tgit reset --hard master &&\n-\tgit checkout -b master2 &&\n+\tgit checkout -b main2 &&\n \tgit merge -s ours --no-commit gui/master &&\n \tgit read-tree --prefix=git-gui2/ -u gui/master &&\n \tgit commit -m \"Merge git-gui2 as our subdirectory\" &&\n@@ -125,8 +125,8 @@ test_expect_success 'initial ambiguous subtree' '\n \n test_expect_success 'merge using explicit' '\n \tcd ../git &&\n-\tgit reset --hard master2 &&\n-\tgit pull -Xsubtree=git-gui gui master2 &&\n+\tgit reset --hard main2 &&\n+\tgit pull -Xsubtree=git-gui gui main2 &&\n \tgit ls-files -s >actual &&\n \t(\n \t\techo \"100644 $o3 0\tgit-gui/git-gui.sh\" &&\n@@ -138,8 +138,8 @@ test_expect_success 'merge using explicit' '\n \n test_expect_success 'merge2 using explicit' '\n \tcd ../git &&\n-\tgit reset --hard master2 &&\n-\tgit pull -Xsubtree=git-gui2 gui master2 &&\n+\tgit reset --hard main2 &&\n+\tgit pull -Xsubtree=git-gui2 gui main2 &&\n \tgit ls-files -s >actual &&\n \t(\n \t\techo \"100644 $o1 0\tgit-gui/git-gui.sh\" &&\n-- \ngitgitgadget\n\n"},{"id":"406084","messageId":"c2c1238b5d9dde684d100fa99437a813140cd615.1600725687.git.gitgitgadget@gmail.com","threadId":"54244","inReplyTo":"pull.734.v2.git.1600725687.gitgitgadget@gmail.com","subject":"[PATCH v2 5/5] t9902: avoid using the branch name `master`","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-09-21T22:01:26Z","receivedAt":"2020-09-21T22:01:37Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nThe completion tests used that name unnecessarily, and it is a\nnon-inclusive term, so let's avoid using it here.\n\nSigned-off-by: Johannes Schindelin \n---\n t/t9902-completion.sh | 10 +++++-----\n 1 file changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/t/t9902-completion.sh b/t/t9902-completion.sh\nindex 8425b9a531..7b7bc6e4bd 100755\n--- a/t/t9902-completion.sh\n+++ b/t/t9902-completion.sh\n@@ -542,37 +542,37 @@ test_expect_success '__gitcomp - doesnt fail because of invalid variable name' '\n '\n \n read -r -d \"\" refs <<-\\EOF\n+main\n maint\n-master\n next\n seen\n EOF\n \n test_expect_success '__gitcomp_nl - trailing space' '\n \ttest_gitcomp_nl \"m\" \"$refs\" <<-EOF\n+\tmain Z\n \tmaint Z\n-\tmaster Z\n \tEOF\n '\n \n test_expect_success '__gitcomp_nl - prefix' '\n \ttest_gitcomp_nl \"--fixup=m\" \"$refs\" \"--fixup=\" \"m\" <<-EOF\n+\t--fixup=main Z\n \t--fixup=maint Z\n-\t--fixup=master Z\n \tEOF\n '\n \n test_expect_success '__gitcomp_nl - suffix' '\n \ttest_gitcomp_nl \"branch.ma\" \"$refs\" \"branch.\" \"ma\" \".\" <<-\\EOF\n+\tbranch.main.Z\n \tbranch.maint.Z\n-\tbranch.master.Z\n \tEOF\n '\n \n test_expect_success '__gitcomp_nl - no suffix' '\n \ttest_gitcomp_nl \"ma\" \"$refs\" \"\" \"ma\" \"\" <<-\\EOF\n+\tmainZ\n \tmaintZ\n-\tmasterZ\n \tEOF\n '\n \n-- \ngitgitgadget\n"},{"id":"406085","messageId":"80e1d46ccefeb39bf3a10c5c973d62fa887210d1.1600725687.git.gitgitgadget@gmail.com","threadId":"54244","inReplyTo":"pull.734.v2.git.1600725687.gitgitgadget@gmail.com","subject":"[PATCH v2 2/5] t/test-terminal: avoid non-inclusive language","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-09-21T22:01:23Z","receivedAt":"2020-09-21T22:01:38Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nIn the ongoing effort to make the Git project a more inclusive place,\nlet's try to avoid names like \"master\" where possible.\n\nIn this instance, the use of the term `slave` is unfortunately enshrined\nin IO::Pty's API. We simply cannot avoid using that word here. But at\nleast we can get rid of the usage of the word `master` and hope that\nIO::Pty will be eventually adjusted, too.\n\nGuessing that IO::Pty might follow Python's lead, we replace the name\n`master` by `parent` (hoping that IO::Pty will adopt the parent/child\nnomenclature, too).\n\nSigned-off-by: Johannes Schindelin \n---\n t/test-terminal.perl | 32 ++++++++++++++++----------------\n 1 file changed, 16 insertions(+), 16 deletions(-)\n\ndiff --git a/t/test-terminal.perl b/t/test-terminal.perl\nindex 46bf618479..1bcf01a9a4 100755\n--- a/t/test-terminal.perl\n+++ b/t/test-terminal.perl\n@@ -81,24 +81,24 @@ sub copy_stdio {\n \tdie \"usage: test-terminal program args\";\n }\n $ENV{TERM} = 'vt100';\n-my $master_in = new IO::Pty;\n-my $master_out = new IO::Pty;\n-my $master_err = new IO::Pty;\n-$master_in->set_raw();\n-$master_out->set_raw();\n-$master_err->set_raw();\n-$master_in->slave->set_raw();\n-$master_out->slave->set_raw();\n-$master_err->slave->set_raw();\n-my $pid = start_child(\\@ARGV, $master_in->slave, $master_out->slave, $master_err->slave);\n-close $master_in->slave;\n-close $master_out->slave;\n-close $master_err->slave;\n-my $in_pid = copy_stdin($master_in);\n-copy_stdio($master_out, $master_err);\n+my $parent_in = new IO::Pty;\n+my $parent_out = new IO::Pty;\n+my $parent_err = new IO::Pty;\n+$parent_in->set_raw();\n+$parent_out->set_raw();\n+$parent_err->set_raw();\n+$parent_in->slave->set_raw();\n+$parent_out->slave->set_raw();\n+$parent_err->slave->set_raw();\n+my $pid = start_child(\\@ARGV, $parent_in->slave, $parent_out->slave, $parent_err->slave);\n+close $parent_in->slave;\n+close $parent_out->slave;\n+close $parent_err->slave;\n+my $in_pid = copy_stdin($parent_in);\n+copy_stdio($parent_out, $parent_err);\n my $ret = finish_child($pid);\n # If the child process terminates before our copy_stdin() process is able to\n-# write all of its data to $master_in, the copy_stdin() process could stall.\n+# write all of its data to $parent_in, the copy_stdin() process could stall.\n # Send SIGTERM to it to ensure it terminates.\n kill 'TERM', $in_pid;\n finish_child($in_pid);\n-- \ngitgitgadget\n\n"},{"id":"406090","messageId":"20200921222458.GB3533110@coredump.intra.peff.net","threadId":"54244","inReplyTo":"pull.734.v2.git.1600725687.gitgitgadget@gmail.com","subject":"Re: [PATCH v2 0/5] Inclusive naming, part II","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2020-09-21T22:24:58Z","receivedAt":"2020-09-21T22:25:01Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Sep 21, 2020 at 10:01:21PM +0000, Johannes Schindelin via GitGitGadget wrote:\n\n> Changes since v1:\n> \n> * Instead of using the name primary for the adjustments to \n> t/test-terminal.perl, we follow Python's lead (which uses the\n> parent/child nomenclature).\n> * The changes to t3200 no longer use variations of the name main as branch\n> names; Instead, the renamed branches are independent from any current or\n> future default branch name.\n\nThanks, I think that does look nicer. Shouldn't the latter bullet apply\nto most of the ones in patch 4, though?\n\nI wonder if they should simply be \"s/master/topic/\" instead of\n\"s/master/main\".\n\n-Peff\n"},{"id":"406096","messageId":"xmqq4knqep8t.fsf@gitster.c.googlers.com","threadId":"54244","inReplyTo":"8f59e19b9562f2673c4fab5509ad8e8e2d48c19c.1600725687.git.gitgitgadget@gmail.com","subject":"Re: [PATCH v2 4/5] tests: avoid variations of the `master` branch name","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-09-21T22:31:14Z","receivedAt":"2020-09-21T22:31:21Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Johannes Schindelin via GitGitGadget\" \nwrites:\n\n> diff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh\n> index 79e43a370b..ba27e9d603 100755\n> --- a/t/t3427-rebase-subtree.sh\n> +++ b/t/t3427-rebase-subtree.sh\n> @@ -15,12 +15,12 @@ commit_message() {\n> # this test script tries to document them. First, the following commit history\n> # is generated (the onelines are shown, time flows from left to right):\n> #\n> -# master1 - master2 - master3\n> +# main1 - main2 - main3\n\nThe improvement between v1 and v2 made to t3200 (the previous step)\nwould equally apply here, no? IOW, master1 didn't have to have a\nname derived from master but could just have been called topic-1.\nSo replacing master[0-9] with topoic[0-9] may be more appropriate\nhere.\n\n"},{"id":"406097","messageId":"xmqqzh5idah8.fsf@gitster.c.googlers.com","threadId":"54244","inReplyTo":"c2c1238b5d9dde684d100fa99437a813140cd615.1600725687.git.gitgitgadget@gmail.com","subject":"Re: [PATCH v2 5/5] t9902: avoid using the branch name `master`","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-09-21T22:35:31Z","receivedAt":"2020-09-21T22:35:39Z","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> The completion tests used that name unnecessarily, and it is a\n> non-inclusive term, so let's avoid using it here.\n>\n> Signed-off-by: Johannes Schindelin \n> ---\n> t/t9902-completion.sh | 10 +++++-----\n> 1 file changed, 5 insertions(+), 5 deletions(-)\n\nHere, the tests and the tested feature do not work any differently\non the first-made branch, so the same \"just use topic, not the\nfirst-made branch name\" used in 3/5 applies here.\n\nLuckily, unlike 3/5 and 4/5, this step does not involve names\nderived from the name of the first-made branch name, so 'main'\nmay be OK as-is, but for consistency across the patches, we may\nwant to consider using 'topic' here as well. I dunno.\n"},{"id":"406433","messageId":"nycvar.QRO.7.76.6.2009260619260.50@tvgsbejvaqbjf.bet","threadId":"54244","inReplyTo":"xmqq4knqep8t.fsf@gitster.c.googlers.com","subject":"Re: [PATCH v2 4/5] tests: avoid variations of the `master` branch name","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2020-09-26T04:20:15Z","receivedAt":"2020-09-26T18:25:20Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Mon, 21 Sep 2020, Junio C Hamano wrote:\n\n> \"Johannes Schindelin via GitGitGadget\" \n> writes:\n>\n> > diff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh\n> > index 79e43a370b..ba27e9d603 100755\n> > --- a/t/t3427-rebase-subtree.sh\n> > +++ b/t/t3427-rebase-subtree.sh\n> > @@ -15,12 +15,12 @@ commit_message() {\n> > # this test script tries to document them. First, the following commit history\n> > # is generated (the onelines are shown, time flows from left to right):\n> > #\n> > -# master1 - master2 - master3\n> > +# main1 - main2 - main3\n>\n> The improvement between v1 and v2 made to t3200 (the previous step)\n> would equally apply here, no? IOW, master1 didn't have to have a\n> name derived from master but could just have been called topic-1.\n> So replacing master[0-9] with topoic[0-9] may be more appropriate\n> here.\n\nIndeed. It also has the benefit that `topic-` has exactly the same amount\nof letters as `master`, therefore we need not worry about any ASCII art\nthat is modified (and might need realigning).\n\nThanks,\nDscho\n"},{"id":"406434","messageId":"nycvar.QRO.7.76.6.2009260623130.50@tvgsbejvaqbjf.bet","threadId":"54244","inReplyTo":"xmqqzh5idah8.fsf@gitster.c.googlers.com","subject":"Re: [PATCH v2 5/5] t9902: avoid using the branch name `master`","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2020-09-26T04:25:12Z","receivedAt":"2020-09-26T18:30:11Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Mon, 21 Sep 2020, Junio C Hamano wrote:\n\n> \"Johannes Schindelin via GitGitGadget\" \n> writes:\n>\n> > From: Johannes Schindelin \n> >\n> > The completion tests used that name unnecessarily, and it is a\n> > non-inclusive term, so let's avoid using it here.\n> >\n> > Signed-off-by: Johannes Schindelin \n> > ---\n> > t/t9902-completion.sh | 10 +++++-----\n> > 1 file changed, 5 insertions(+), 5 deletions(-)\n>\n> Here, the tests and the tested feature do not work any differently\n> on the first-made branch, so the same \"just use topic, not the\n> first-made branch name\" used in 3/5 applies here.\n>\n> Luckily, unlike 3/5 and 4/5, this step does not involve names\n> derived from the name of the first-made branch name, so 'main'\n> may be OK as-is, but for consistency across the patches, we may\n> want to consider using 'topic' here as well. I dunno.\n\nI am afraid that three test cases that are touched by this test rely on\nthe fact that the first two letters (or just the first letter) are\nambiguous when tab-completing branch names: `ma` could complete to either\n`master` or `maint`.\n\nTo clarify, I added a paragraph to the commit message.\n\nCiao,\nDscho\n"},{"id":"406435","messageId":"nycvar.QRO.7.76.6.2009260629120.50@tvgsbejvaqbjf.bet","threadId":"54244","inReplyTo":"20200921222458.GB3533110@coredump.intra.peff.net","subject":"Re: [PATCH v2 0/5] Inclusive naming, part II","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2020-09-26T04:29:50Z","receivedAt":"2020-09-26T18:34:51Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Peff,\n\nOn Mon, 21 Sep 2020, Jeff King wrote:\n\n> On Mon, Sep 21, 2020 at 10:01:21PM +0000, Johannes Schindelin via GitGitGadget wrote:\n>\n> > Changes since v1:\n> >\n> > * Instead of using the name primary for the adjustments to\n> > t/test-terminal.perl, we follow Python's lead (which uses the\n> > parent/child nomenclature).\n> > * The changes to t3200 no longer use variations of the name main as branch\n> > names; Instead, the renamed branches are independent from any current or\n> > future default branch name.\n>\n> Thanks, I think that does look nicer. Shouldn't the latter bullet apply\n> to most of the ones in patch 4, though?\n>\n> I wonder if they should simply be \"s/master/topic/\" instead of\n> \"s/master/main\".\n\nYes! I did that in 4/5. In 5/5, we need a branch name that starts with the\nsame two letters as `maint`, though. I amended the commit message\naccordingly.\n\nThanks,\nDscho\n"},{"id":"406441","messageId":"587ddca42ae36be3d5b333cefe1f9af768bacc9a.1601154262.git.gitgitgadget@gmail.com","threadId":"54244","inReplyTo":"pull.734.v3.git.1601154262.gitgitgadget@gmail.com","subject":"[PATCH v3 1/5] fast-export: avoid using unnecessary language in a code comment","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-09-26T21:04:18Z","receivedAt":"2020-09-26T21:04:27Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nIn an ongoing effort to avoid non-inclusive language, let's avoid using\nthe branch name \"master\" in a code comment.\n\nSigned-off-by: Johannes Schindelin \n---\n builtin/fast-export.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/fast-export.c b/builtin/fast-export.c\nindex 1b8fca3ee0..5527135ba8 100644\n--- a/builtin/fast-export.c\n+++ b/builtin/fast-export.c\n@@ -1026,7 +1026,7 @@ static void handle_tags_and_duplicates(struct string_list *extras)\n \t\t\t\t/*\n \t\t\t\t * Getting here means we have a commit which\n \t\t\t\t * was excluded by a negative refspec (e.g.\n-\t\t\t\t * fast-export ^master master). If we are\n+\t\t\t\t * fast-export ^HEAD HEAD). If we are\n \t\t\t\t * referencing excluded commits, set the ref\n \t\t\t\t * to the exact commit. Otherwise, the user\n \t\t\t\t * wants the branch exported but every commit\n-- \ngitgitgadget\n\n"},{"id":"406442","messageId":"pull.734.v3.git.1601154262.gitgitgadget@gmail.com","threadId":"54244","inReplyTo":"pull.734.v2.git.1600725687.gitgitgadget@gmail.com","subject":"[PATCH v3 0/5] Inclusive naming, part II","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-09-26T21:04:17Z","receivedAt":"2020-09-26T21:04:27Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"This patch series represents the logical next step on the journey begun with\nintroducing init.defaultBranch: in these patches, we avoid a couple\nunnecessary mentions of the branch name \"master\".\n\nThis patch series does not try to change the default branch name, although I\nhave that patch series ready to go. You can see the overall idea here: \nhttps://github.com/gitgitgadget/git/pull/655. Concretely, I plan on\nsubmitting three more patch series after this one:\n\n 1. a relatively small patch series to avoid using the branch name main in\n the test suite. This is necessary because my plan is to change the\n default branch name to that name, therefore it cannot be used as the\n name of a topic branch any longer.\n 2. a relatively large patch series (currently consisting of 18 patches) to\n change the default branch name to main. Most of the patches provide\n non-trivial (read: non-scriptable) adjustments to the test suite in an\n incremental fashion, with a big patch toward the end that reflects a\n fully-automated search-and-replace of all the trivial cases.\n 3. a very small patch series with fall-out patches that are not necessary\n to pass the test suite, but are still required to complete the rename\n (adjusted code comment, file rename).\n\n(Note: I am still debating whether I should move one or two patches from the\nsecond to the third patch series)\n\nChanges since v2:\n\n * Extended the idea of using topic instead of main to patch 4/5.\n * Explained in the commit message of patch 5/5 why we cannot use topic \n instead of main here.\n\nChanges since v1:\n\n * Instead of using the name primary for the adjustments to \n t/test-terminal.perl, we follow Python's lead (which uses the\n parent/child nomenclature).\n * The changes to t3200 no longer use variations of the name main as branch\n names; Instead, the renamed branches are independent from any current or\n future default branch name.\n\nJohannes Schindelin (5):\n fast-export: avoid using unnecessary language in a code comment\n t/test-terminal: avoid non-inclusive language\n t3200: avoid variations of the `master` branch name\n tests: avoid variations of the `master` branch name\n t9902: avoid using the branch name `master`\n\n builtin/fast-export.c | 2 +-\n t/t3200-branch.sh | 34 ++++++++++++++---------------\n t/t3427-rebase-subtree.sh | 42 ++++++++++++++++++------------------\n t/t4150-am.sh | 8 +++----\n t/t5515-fetch-merge-logic.sh | 6 +++---\n t/t5523-push-upstream.sh | 20 ++++++++---------\n t/t6018-rev-list-glob.sh | 6 +++---\n t/t6040-tracking-info.sh | 20 ++++++++---------\n t/t6409-merge-subtree.sh | 14 ++++++------\n t/t9902-completion.sh | 10 ++++-----\n t/test-terminal.perl | 32 +++++++++++++--------------\n 11 files changed, 97 insertions(+), 97 deletions(-)\n\n\nbase-commit: 54e85e7af1ac9e9a92888060d6811ae767fea1bc\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-734%2Fdscho%2Favoid-unnecessary-branch-name-v3\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-734/dscho/avoid-unnecessary-branch-name-v3\nPull-Request: https://github.com/gitgitgadget/git/pull/734\n\nRange-diff vs v2:\n\n 1: 587ddca42a = 1: 587ddca42a fast-export: avoid using unnecessary language in a code comment\n 2: 80e1d46cce = 2: 80e1d46cce t/test-terminal: avoid non-inclusive language\n 3: 8d8e9abfe2 = 3: 8d8e9abfe2 t3200: avoid variations of the `master` branch name\n 4: 8f59e19b95 ! 4: ef8a9b74ed tests: avoid variations of the `master` branch name\n @@ Commit message\n because they do not require any changes outside of the test script, so\n let's do that.\n \n - Seeing as `main` seems to be materializing as the favorite default\n - branch name of many Open Source projects, we use that name in our\n - replacements, too.\n + Seeing as the touched branches have very little (if anything) to do with\n + the default branch, we choose to use a completely separate naming\n + scheme: `topic_` (it cannot be `topic-` because t5515\n + uses the `test_oid` machinery with the term, and that machinery uses\n + shell variables internally, whose names cannot contain dashes).\n \n This trick was performed by this (GNU) sed invocation:\n \n - $ sed -i 's/master\\([a-z0-9]\\)/main\\1/g' t/t*.sh\n + $ sed -i 's/master\\([a-z0-9]\\)/topic_\\1/g' t/t*.sh\n \n Signed-off-by: Johannes Schindelin \n \n @@ t/t3427-rebase-subtree.sh: commit_message() {\n # is generated (the onelines are shown, time flows from left to right):\n #\n -# master1 - master2 - master3\n -+# main1 - main2 - main3\n ++# topic_1 - topic_2 - topic_3\n # \\\n -# README ---------------------- Add subproject master - master4 - files_subtree/master5\n -+# README ---------------------- Add subproject master - main4 - files_subtree/main5\n ++# README ---------------------- Add subproject master - topic_4 - files_subtree/topic_5\n #\n # Where the merge moves the files master[123].t into the subdirectory\n -# files_subtree/ and master4 as well as files_subtree/master5 add files to that\n -+# files_subtree/ and main4 as well as files_subtree/main5 add files to that\n ++# files_subtree/ and topic_4 as well as files_subtree/topic_5 add files to that\n # directory directly.\n #\n # Then, in subsequent test cases, `git filter-branch` is used to distill just\n @@ t/t3427-rebase-subtree.sh: commit_message() {\n # this:\n #\n -# Add subproject master - master4 - files_subtree/master5 - Empty commit\n -+# Add subproject master - main4 - files_subtree/main5 - Empty commit\n ++# Add subproject master - topic_4 - files_subtree/topic_5 - Empty commit\n #\n -# where the root commit adds three files: master1.t, master2.t and master3.t.\n -+# where the root commit adds three files: main1.t, main2.t and main3.t.\n ++# where the root commit adds three files: topic_1.t, topic_2.t and topic_3.t.\n #\n -# This commit history is then rebased onto `master3` with the\n -+# This commit history is then rebased onto `main3` with the\n ++# This commit history is then rebased onto `topic_3` with the\n # `-Xsubtree=files_subtree` option in three different ways:\n #\n # 1. using `--preserve-merges`\n @@ t/t3427-rebase-subtree.sh: test_expect_success 'setup' '\n -\ttest_commit -C files master1 &&\n -\ttest_commit -C files master2 &&\n -\ttest_commit -C files master3 &&\n -+\ttest_commit -C files main1 &&\n -+\ttest_commit -C files main2 &&\n -+\ttest_commit -C files main3 &&\n ++\ttest_commit -C files topic_1 &&\n ++\ttest_commit -C files topic_2 &&\n ++\ttest_commit -C files topic_3 &&\n \n \t: perform subtree merge into files_subtree/ &&\n \tgit fetch files refs/heads/master:refs/heads/files-master &&\n @@ t/t3427-rebase-subtree.sh: test_expect_success 'setup' '\n \t: add two extra commits to rebase &&\n -\ttest_commit -C files_subtree master4 &&\n -\ttest_commit files_subtree/master5 &&\n -+\ttest_commit -C files_subtree main4 &&\n -+\ttest_commit files_subtree/main5 &&\n ++\ttest_commit -C files_subtree topic_4 &&\n ++\ttest_commit files_subtree/topic_5 &&\n \n \tgit checkout -b to-rebase &&\n \tgit fast-export --no-data HEAD -- files_subtree/ |\n @@ t/t3427-rebase-subtree.sh: test_expect_success 'setup' '\n '\n \n -# FAILURE: Does not preserve master4.\n -+# FAILURE: Does not preserve main4.\n ++# FAILURE: Does not preserve topic_4.\n test_expect_failure REBASE_P 'Rebase -Xsubtree --preserve-merges --onto commit' '\n \treset_rebase &&\n \tgit checkout -b rebase-preserve-merges to-rebase &&\n \tgit rebase -Xsubtree=files_subtree --preserve-merges --onto files-master master &&\n -\tverbose test \"$(commit_message HEAD~)\" = \"master4\" &&\n -\tverbose test \"$(commit_message HEAD)\" = \"files_subtree/master5\"\n -+\tverbose test \"$(commit_message HEAD~)\" = \"main4\" &&\n -+\tverbose test \"$(commit_message HEAD)\" = \"files_subtree/main5\"\n ++\tverbose test \"$(commit_message HEAD~)\" = \"topic_4\" &&\n ++\tverbose test \"$(commit_message HEAD)\" = \"files_subtree/topic_5\"\n '\n \n -# FAILURE: Does not preserve master4.\n -+# FAILURE: Does not preserve main4.\n ++# FAILURE: Does not preserve topic_4.\n test_expect_failure REBASE_P 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit' '\n \treset_rebase &&\n \tgit checkout -b rebase-keep-empty to-rebase &&\n \tgit rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master &&\n -\tverbose test \"$(commit_message HEAD~2)\" = \"master4\" &&\n -\tverbose test \"$(commit_message HEAD~)\" = \"files_subtree/master5\" &&\n -+\tverbose test \"$(commit_message HEAD~2)\" = \"main4\" &&\n -+\tverbose test \"$(commit_message HEAD~)\" = \"files_subtree/main5\" &&\n ++\tverbose test \"$(commit_message HEAD~2)\" = \"topic_4\" &&\n ++\tverbose test \"$(commit_message HEAD~)\" = \"files_subtree/topic_5\" &&\n \tverbose test \"$(commit_message HEAD)\" = \"Empty commit\"\n '\n \n @@ t/t3427-rebase-subtree.sh: test_expect_success 'Rebase -Xsubtree --empty=ask --o\n \tgit rebase --skip &&\n -\tverbose test \"$(commit_message HEAD~2)\" = \"master4\" &&\n -\tverbose test \"$(commit_message HEAD~)\" = \"files_subtree/master5\" &&\n -+\tverbose test \"$(commit_message HEAD~2)\" = \"main4\" &&\n -+\tverbose test \"$(commit_message HEAD~)\" = \"files_subtree/main5\" &&\n ++\tverbose test \"$(commit_message HEAD~2)\" = \"topic_4\" &&\n ++\tverbose test \"$(commit_message HEAD~)\" = \"files_subtree/topic_5\" &&\n \tverbose test \"$(commit_message HEAD)\" = \"Empty commit\"\n '\n \n @@ t/t3427-rebase-subtree.sh: test_expect_success 'Rebase -Xsubtree --empty=ask --r\n \tgit rebase --skip &&\n -\tverbose test \"$(commit_message HEAD~2)\" = \"master4\" &&\n -\tverbose test \"$(commit_message HEAD~)\" = \"files_subtree/master5\" &&\n -+\tverbose test \"$(commit_message HEAD~2)\" = \"main4\" &&\n -+\tverbose test \"$(commit_message HEAD~)\" = \"files_subtree/main5\" &&\n ++\tverbose test \"$(commit_message HEAD~2)\" = \"topic_4\" &&\n ++\tverbose test \"$(commit_message HEAD~)\" = \"files_subtree/topic_5\" &&\n \tverbose test \"$(commit_message HEAD)\" = \"Empty commit\"\n '\n \n @@ t/t4150-am.sh: test_expect_success 'am changes committer and keeps author' '\n \trm -fr .git/rebase-apply &&\n \tgit reset --hard &&\n -\tgit checkout -b master2 first &&\n -+\tgit checkout -b main2 first &&\n ++\tgit checkout -b topic_2 first &&\n \tgit am --signoff \\n\\n\" \\\n @@ t/t4150-am.sh: test_expect_success 'am --signoff adds Signed-off-by: line' '\n \n test_expect_success 'am stays in branch' '\n -\techo refs/heads/master2 >expected &&\n -+\techo refs/heads/main2 >expected &&\n ++\techo refs/heads/topic_2 >expected &&\n \tgit symbolic-ref HEAD >actual &&\n \ttest_cmp expected actual\n '\n @@ t/t4150-am.sh: test_expect_success 'am without --keep removes Re: and [PATCH] st\n \tgit am expected &&\n -\tgit rev-parse master2 >actual &&\n -+\tgit rev-parse main2 >actual &&\n ++\tgit rev-parse topic_2 >actual &&\n \ttest_cmp expected actual\n '\n \n @@ t/t4150-am.sh: test_expect_success 'am --keep-non-patch really keeps the non-pat\n \trm -fr .git/rebase-apply &&\n \tgit reset --hard &&\n -\tgit checkout -b base3way master2 &&\n -+\tgit checkout -b base3way main2 &&\n ++\tgit checkout -b base3way topic_2 &&\n \tsed -n -e \"3,\\$p\" msg >file &&\n \thead -n 9 msg >>file &&\n \tgit add file &&\n @@ t/t5515-fetch-merge-logic.sh: export GIT_TEST_PROTOCOL_VERSION\n build_script () {\n \tscript=\"$1\" &&\n -\tfor i in one three_file master master2 one_tree three two two2 three2\n -+\tfor i in one three_file master main2 one_tree three two two2 three2\n ++\tfor i in one three_file master topic_2 one_tree three two two2 three2\n \tdo\n \t\techo \"s/$(test_oid --hash=sha1 \"$i\")/$(test_oid \"$i\")/g\" >>\"$script\"\n \tdone\n @@ t/t5515-fetch-merge-logic.sh: test_expect_success setup '\n \n -\tmaster2 sha1:754b754407bf032e9a2f9d5a9ad05ca79a6b228f\n -\tmaster2 sha256:6c7abaea8a6d8ef4d89877e68462758dc6774690fbbbb0e6d7dd57415c9abde0\n -+\tmain2 sha1:754b754407bf032e9a2f9d5a9ad05ca79a6b228f\n -+\tmain2 sha256:6c7abaea8a6d8ef4d89877e68462758dc6774690fbbbb0e6d7dd57415c9abde0\n ++\ttopic_2 sha1:754b754407bf032e9a2f9d5a9ad05ca79a6b228f\n ++\ttopic_2 sha256:6c7abaea8a6d8ef4d89877e68462758dc6774690fbbbb0e6d7dd57415c9abde0\n \n \ttwo2 sha1:6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\n \ttwo2 sha256:87a2d3ee29c83a3dc7afd41c0606b11f67603120b910a7be7840accdc18344d4\n @@ t/t5523-push-upstream.sh: test_expect_success 'push -u --dry-run master:otherX'\n -\tgit branch master2 &&\n -\tgit push -u upstream master2:master2 &&\n -\tcheck_config master2 upstream refs/heads/master2\n -+test_expect_success 'push -u main2:main2' '\n -+\tgit branch main2 &&\n -+\tgit push -u upstream main2:main2 &&\n -+\tcheck_config main2 upstream refs/heads/main2\n ++test_expect_success 'push -u topic_2:topic_2' '\n ++\tgit branch topic_2 &&\n ++\tgit push -u upstream topic_2:topic_2 &&\n ++\tcheck_config topic_2 upstream refs/heads/topic_2\n '\n \n -test_expect_success 'push -u master2:other2' '\n -\tgit push -u upstream master2:other2 &&\n -\tcheck_config master2 upstream refs/heads/other2\n -+test_expect_success 'push -u main2:other2' '\n -+\tgit push -u upstream main2:other2 &&\n -+\tcheck_config main2 upstream refs/heads/other2\n ++test_expect_success 'push -u topic_2:other2' '\n ++\tgit push -u upstream topic_2:other2 &&\n ++\tcheck_config topic_2 upstream refs/heads/other2\n '\n \n -test_expect_success 'push -u :master2' '\n -\tgit push -u upstream :master2 &&\n -\tcheck_config master2 upstream refs/heads/other2\n -+test_expect_success 'push -u :main2' '\n -+\tgit push -u upstream :main2 &&\n -+\tcheck_config main2 upstream refs/heads/other2\n ++test_expect_success 'push -u :topic_2' '\n ++\tgit push -u upstream :topic_2 &&\n ++\tcheck_config topic_2 upstream refs/heads/other2\n '\n \n test_expect_success 'push -u --all' '\n @@ t/t6018-rev-list-glob.sh: test_expect_success 'setup' '\n \tcommit some &&\n \tgit checkout master &&\n -\tcommit master2 &&\n -+\tcommit main2 &&\n ++\tcommit topic_2 &&\n \tgit tag foo/bar master &&\n -\tcommit master3 &&\n -+\tcommit main3 &&\n ++\tcommit topic_3 &&\n \tgit update-ref refs/remotes/foo/baz master &&\n -\tcommit master4 &&\n -+\tcommit main4 &&\n ++\tcommit topic_4 &&\n \tgit update-ref refs/remotes/upstream/one subspace/one &&\n \tgit update-ref refs/remotes/upstream/two subspace/two &&\n \tgit update-ref refs/remotes/upstream/x subspace-x &&\n @@ t/t6040-tracking-info.sh: test_expect_success 'fail to track annotated tags' '\n -\tgit update-ref refs/heads/from-master2 from-master2^ &&\n -\tgit rev-parse from-master2 >expect2 &&\n -\tgit branch --set-upstream-to master from-master2 &&\n -+\tgit branch from-main2 master &&\n -+\ttest_must_fail git config branch.from-main2.merge > actual &&\n -+\tgit rev-list from-main2 &&\n -+\tgit update-ref refs/heads/from-main2 from-main2^ &&\n -+\tgit rev-parse from-main2 >expect2 &&\n -+\tgit branch --set-upstream-to master from-main2 &&\n ++\tgit branch from-topic_2 master &&\n ++\ttest_must_fail git config branch.from-topic_2.merge > actual &&\n ++\tgit rev-list from-topic_2 &&\n ++\tgit update-ref refs/heads/from-topic_2 from-topic_2^ &&\n ++\tgit rev-parse from-topic_2 >expect2 &&\n ++\tgit branch --set-upstream-to master from-topic_2 &&\n \tgit config branch.from-master.merge > actual &&\n -\tgit rev-parse from-master2 >actual2 &&\n -+\tgit rev-parse from-main2 >actual2 &&\n ++\tgit rev-parse from-topic_2 >actual2 &&\n \tgrep -q \"^refs/heads/master$\" actual &&\n \tcmp expect2 actual2\n '\n @@ t/t6040-tracking-info.sh: test_expect_success 'fail to track annotated tags' '\n \tgit checkout follower &&\n -\tgit checkout from-master2 &&\n -\tgit config branch.from-master2.merge > expect2 &&\n -+\tgit checkout from-main2 &&\n -+\tgit config branch.from-main2.merge > expect2 &&\n ++\tgit checkout from-topic_2 &&\n ++\tgit config branch.from-topic_2.merge > expect2 &&\n \tgit branch --set-upstream-to @{-1} from-master &&\n \tgit config branch.from-master.merge > actual &&\n -\tgit config branch.from-master2.merge > actual2 &&\n -+\tgit config branch.from-main2.merge > actual2 &&\n ++\tgit config branch.from-topic_2.merge > actual2 &&\n \tgit branch --set-upstream-to follower from-master &&\n \tgit config branch.from-master.merge > expect &&\n \ttest_cmp expect2 actual2 &&\n @@ t/t6409-merge-subtree.sh: test_expect_success 'merge update' '\n \to3=$(git hash-object git-gui.sh) &&\n \tgit add git-gui.sh &&\n -\tgit checkout -b master2 &&\n -+\tgit checkout -b main2 &&\n ++\tgit checkout -b topic_2 &&\n \tgit commit -m \"update git-gui\" &&\n \tcd ../git &&\n -\tgit pull -s subtree gui master2 &&\n -+\tgit pull -s subtree gui main2 &&\n ++\tgit pull -s subtree gui topic_2 &&\n \tgit ls-files -s >actual &&\n \t(\n \t\techo \"100644 $o3 0\tgit-gui/git-gui.sh\" &&\n @@ t/t6409-merge-subtree.sh: test_expect_success 'merge update' '\n \tcd ../git &&\n \tgit reset --hard master &&\n -\tgit checkout -b master2 &&\n -+\tgit checkout -b main2 &&\n ++\tgit checkout -b topic_2 &&\n \tgit merge -s ours --no-commit gui/master &&\n \tgit read-tree --prefix=git-gui2/ -u gui/master &&\n \tgit commit -m \"Merge git-gui2 as our subdirectory\" &&\n @@ t/t6409-merge-subtree.sh: test_expect_success 'initial ambiguous subtree' '\n \tcd ../git &&\n -\tgit reset --hard master2 &&\n -\tgit pull -Xsubtree=git-gui gui master2 &&\n -+\tgit reset --hard main2 &&\n -+\tgit pull -Xsubtree=git-gui gui main2 &&\n ++\tgit reset --hard topic_2 &&\n ++\tgit pull -Xsubtree=git-gui gui topic_2 &&\n \tgit ls-files -s >actual &&\n \t(\n \t\techo \"100644 $o3 0\tgit-gui/git-gui.sh\" &&\n @@ t/t6409-merge-subtree.sh: test_expect_success 'merge using explicit' '\n \tcd ../git &&\n -\tgit reset --hard master2 &&\n -\tgit pull -Xsubtree=git-gui2 gui master2 &&\n -+\tgit reset --hard main2 &&\n -+\tgit pull -Xsubtree=git-gui2 gui main2 &&\n ++\tgit reset --hard topic_2 &&\n ++\tgit pull -Xsubtree=git-gui2 gui topic_2 &&\n \tgit ls-files -s >actual &&\n \t(\n \t\techo \"100644 $o1 0\tgit-gui/git-gui.sh\" &&\n 5: c2c1238b5d ! 5: a80297f5df t9902: avoid using the branch name `master`\n @@ Commit message\n The completion tests used that name unnecessarily, and it is a\n non-inclusive term, so let's avoid using it here.\n \n + Since three of the touched test cases make use of the fact that two of\n + the branch names (`master` and `maint`) start with the same letter (or\n + even with the same two letters), we choose to replace the use of\n + `master` by a name that also has that property: `main`.\n +\n Signed-off-by: Johannes Schindelin \n \n ## t/t9902-completion.sh ##\n\n-- \ngitgitgadget\n"},{"id":"406443","messageId":"80e1d46ccefeb39bf3a10c5c973d62fa887210d1.1601154262.git.gitgitgadget@gmail.com","threadId":"54244","inReplyTo":"pull.734.v3.git.1601154262.gitgitgadget@gmail.com","subject":"[PATCH v3 2/5] t/test-terminal: avoid non-inclusive language","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-09-26T21:04:19Z","receivedAt":"2020-09-26T21:04:30Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nIn the ongoing effort to make the Git project a more inclusive place,\nlet's try to avoid names like \"master\" where possible.\n\nIn this instance, the use of the term `slave` is unfortunately enshrined\nin IO::Pty's API. We simply cannot avoid using that word here. But at\nleast we can get rid of the usage of the word `master` and hope that\nIO::Pty will be eventually adjusted, too.\n\nGuessing that IO::Pty might follow Python's lead, we replace the name\n`master` by `parent` (hoping that IO::Pty will adopt the parent/child\nnomenclature, too).\n\nSigned-off-by: Johannes Schindelin \n---\n t/test-terminal.perl | 32 ++++++++++++++++----------------\n 1 file changed, 16 insertions(+), 16 deletions(-)\n\ndiff --git a/t/test-terminal.perl b/t/test-terminal.perl\nindex 46bf618479..1bcf01a9a4 100755\n--- a/t/test-terminal.perl\n+++ b/t/test-terminal.perl\n@@ -81,24 +81,24 @@ sub copy_stdio {\n \tdie \"usage: test-terminal program args\";\n }\n $ENV{TERM} = 'vt100';\n-my $master_in = new IO::Pty;\n-my $master_out = new IO::Pty;\n-my $master_err = new IO::Pty;\n-$master_in->set_raw();\n-$master_out->set_raw();\n-$master_err->set_raw();\n-$master_in->slave->set_raw();\n-$master_out->slave->set_raw();\n-$master_err->slave->set_raw();\n-my $pid = start_child(\\@ARGV, $master_in->slave, $master_out->slave, $master_err->slave);\n-close $master_in->slave;\n-close $master_out->slave;\n-close $master_err->slave;\n-my $in_pid = copy_stdin($master_in);\n-copy_stdio($master_out, $master_err);\n+my $parent_in = new IO::Pty;\n+my $parent_out = new IO::Pty;\n+my $parent_err = new IO::Pty;\n+$parent_in->set_raw();\n+$parent_out->set_raw();\n+$parent_err->set_raw();\n+$parent_in->slave->set_raw();\n+$parent_out->slave->set_raw();\n+$parent_err->slave->set_raw();\n+my $pid = start_child(\\@ARGV, $parent_in->slave, $parent_out->slave, $parent_err->slave);\n+close $parent_in->slave;\n+close $parent_out->slave;\n+close $parent_err->slave;\n+my $in_pid = copy_stdin($parent_in);\n+copy_stdio($parent_out, $parent_err);\n my $ret = finish_child($pid);\n # If the child process terminates before our copy_stdin() process is able to\n-# write all of its data to $master_in, the copy_stdin() process could stall.\n+# write all of its data to $parent_in, the copy_stdin() process could stall.\n # Send SIGTERM to it to ensure it terminates.\n kill 'TERM', $in_pid;\n finish_child($in_pid);\n-- \ngitgitgadget\n\n"},{"id":"406445","messageId":"ef8a9b74ed9b2985e6258bcc90295be12231f333.1601154262.git.gitgitgadget@gmail.com","threadId":"54244","inReplyTo":"pull.734.v3.git.1601154262.gitgitgadget@gmail.com","subject":"[PATCH v3 4/5] tests: avoid variations of the `master` branch name","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-09-26T21:04:21Z","receivedAt":"2020-09-26T21:04:34Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nThe term `master` has a loaded history that serves as a constant\nreminder of racial injustice. The Git project has no desire to\nperpetuate this and already started avoiding it.\n\nThe test suite uses variations of this name for branches other than the\ndefault one. Apart from t3200, where we just addressed this in the\nprevious commit, those instances can be renamed in an automated manner\nbecause they do not require any changes outside of the test script, so\nlet's do that.\n\nSeeing as the touched branches have very little (if anything) to do with\nthe default branch, we choose to use a completely separate naming\nscheme: `topic_` (it cannot be `topic-` because t5515\nuses the `test_oid` machinery with the term, and that machinery uses\nshell variables internally, whose names cannot contain dashes).\n\nThis trick was performed by this (GNU) sed invocation:\n\n\t$ sed -i 's/master\\([a-z0-9]\\)/topic_\\1/g' t/t*.sh\n\nSigned-off-by: Johannes Schindelin \n---\n t/t3427-rebase-subtree.sh | 42 ++++++++++++++++++------------------\n t/t4150-am.sh | 8 +++----\n t/t5515-fetch-merge-logic.sh | 6 +++---\n t/t5523-push-upstream.sh | 20 ++++++++---------\n t/t6018-rev-list-glob.sh | 6 +++---\n t/t6040-tracking-info.sh | 20 ++++++++---------\n t/t6409-merge-subtree.sh | 14 ++++++------\n 7 files changed, 58 insertions(+), 58 deletions(-)\n\ndiff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh\nindex 79e43a370b..2a7d958ea7 100755\n--- a/t/t3427-rebase-subtree.sh\n+++ b/t/t3427-rebase-subtree.sh\n@@ -15,12 +15,12 @@ commit_message() {\n # this test script tries to document them. First, the following commit history\n # is generated (the onelines are shown, time flows from left to right):\n #\n-# master1 - master2 - master3\n+# topic_1 - topic_2 - topic_3\n # \\\n-# README ---------------------- Add subproject master - master4 - files_subtree/master5\n+# README ---------------------- Add subproject master - topic_4 - files_subtree/topic_5\n #\n # Where the merge moves the files master[123].t into the subdirectory\n-# files_subtree/ and master4 as well as files_subtree/master5 add files to that\n+# files_subtree/ and topic_4 as well as files_subtree/topic_5 add files to that\n # directory directly.\n #\n # Then, in subsequent test cases, `git filter-branch` is used to distill just\n@@ -28,11 +28,11 @@ commit_message() {\n # an empty commit is added on top. The pre-rebase commit history looks like\n # this:\n #\n-# Add subproject master - master4 - files_subtree/master5 - Empty commit\n+# Add subproject master - topic_4 - files_subtree/topic_5 - Empty commit\n #\n-# where the root commit adds three files: master1.t, master2.t and master3.t.\n+# where the root commit adds three files: topic_1.t, topic_2.t and topic_3.t.\n #\n-# This commit history is then rebased onto `master3` with the\n+# This commit history is then rebased onto `topic_3` with the\n # `-Xsubtree=files_subtree` option in three different ways:\n #\n # 1. using `--preserve-merges`\n@@ -43,9 +43,9 @@ test_expect_success 'setup' '\n \ttest_commit README &&\n \n \tgit init files &&\n-\ttest_commit -C files master1 &&\n-\ttest_commit -C files master2 &&\n-\ttest_commit -C files master3 &&\n+\ttest_commit -C files topic_1 &&\n+\ttest_commit -C files topic_2 &&\n+\ttest_commit -C files topic_3 &&\n \n \t: perform subtree merge into files_subtree/ &&\n \tgit fetch files refs/heads/master:refs/heads/files-master &&\n@@ -55,8 +55,8 @@ test_expect_success 'setup' '\n \tgit commit -m \"Add subproject master\" &&\n \n \t: add two extra commits to rebase &&\n-\ttest_commit -C files_subtree master4 &&\n-\ttest_commit files_subtree/master5 &&\n+\ttest_commit -C files_subtree topic_4 &&\n+\ttest_commit files_subtree/topic_5 &&\n \n \tgit checkout -b to-rebase &&\n \tgit fast-export --no-data HEAD -- files_subtree/ |\n@@ -66,22 +66,22 @@ test_expect_success 'setup' '\n \tgit commit -m \"Empty commit\" --allow-empty\n '\n \n-# FAILURE: Does not preserve master4.\n+# FAILURE: Does not preserve topic_4.\n test_expect_failure REBASE_P 'Rebase -Xsubtree --preserve-merges --onto commit' '\n \treset_rebase &&\n \tgit checkout -b rebase-preserve-merges to-rebase &&\n \tgit rebase -Xsubtree=files_subtree --preserve-merges --onto files-master master &&\n-\tverbose test \"$(commit_message HEAD~)\" = \"master4\" &&\n-\tverbose test \"$(commit_message HEAD)\" = \"files_subtree/master5\"\n+\tverbose test \"$(commit_message HEAD~)\" = \"topic_4\" &&\n+\tverbose test \"$(commit_message HEAD)\" = \"files_subtree/topic_5\"\n '\n \n-# FAILURE: Does not preserve master4.\n+# FAILURE: Does not preserve topic_4.\n test_expect_failure REBASE_P 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit' '\n \treset_rebase &&\n \tgit checkout -b rebase-keep-empty to-rebase &&\n \tgit rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master &&\n-\tverbose test \"$(commit_message HEAD~2)\" = \"master4\" &&\n-\tverbose test \"$(commit_message HEAD~)\" = \"files_subtree/master5\" &&\n+\tverbose test \"$(commit_message HEAD~2)\" = \"topic_4\" &&\n+\tverbose test \"$(commit_message HEAD~)\" = \"files_subtree/topic_5\" &&\n \tverbose test \"$(commit_message HEAD)\" = \"Empty commit\"\n '\n \n@@ -91,8 +91,8 @@ test_expect_success 'Rebase -Xsubtree --empty=ask --onto commit' '\n \ttest_must_fail git rebase -Xsubtree=files_subtree --empty=ask --onto files-master master &&\n \t: first pick results in no changes &&\n \tgit rebase --skip &&\n-\tverbose test \"$(commit_message HEAD~2)\" = \"master4\" &&\n-\tverbose test \"$(commit_message HEAD~)\" = \"files_subtree/master5\" &&\n+\tverbose test \"$(commit_message HEAD~2)\" = \"topic_4\" &&\n+\tverbose test \"$(commit_message HEAD~)\" = \"files_subtree/topic_5\" &&\n \tverbose test \"$(commit_message HEAD)\" = \"Empty commit\"\n '\n \n@@ -102,8 +102,8 @@ test_expect_success 'Rebase -Xsubtree --empty=ask --rebase-merges --onto commit'\n \ttest_must_fail git rebase -Xsubtree=files_subtree --empty=ask --rebase-merges --onto files-master --root &&\n \t: first pick results in no changes &&\n \tgit rebase --skip &&\n-\tverbose test \"$(commit_message HEAD~2)\" = \"master4\" &&\n-\tverbose test \"$(commit_message HEAD~)\" = \"files_subtree/master5\" &&\n+\tverbose test \"$(commit_message HEAD~2)\" = \"topic_4\" &&\n+\tverbose test \"$(commit_message HEAD~)\" = \"files_subtree/topic_5\" &&\n \tverbose test \"$(commit_message HEAD)\" = \"Empty commit\"\n '\n \ndiff --git a/t/t4150-am.sh b/t/t4150-am.sh\nindex 1da8ab120b..3ecbef6f8e 100755\n--- a/t/t4150-am.sh\n+++ b/t/t4150-am.sh\n@@ -465,7 +465,7 @@ test_expect_success 'am changes committer and keeps author' '\n test_expect_success 'am --signoff adds Signed-off-by: line' '\n \trm -fr .git/rebase-apply &&\n \tgit reset --hard &&\n-\tgit checkout -b master2 first &&\n+\tgit checkout -b topic_2 first &&\n \tgit am --signoff \\n\\n\" \\\n@@ -479,7 +479,7 @@ test_expect_success 'am --signoff adds Signed-off-by: line' '\n '\n \n test_expect_success 'am stays in branch' '\n-\techo refs/heads/master2 >expected &&\n+\techo refs/heads/topic_2 >expected &&\n \tgit symbolic-ref HEAD >actual &&\n \ttest_cmp expected actual\n '\n@@ -540,7 +540,7 @@ test_expect_success 'am without --keep removes Re: and [PATCH] stuff' '\n \tgit reset --hard HEAD^ &&\n \tgit am expected &&\n-\tgit rev-parse master2 >actual &&\n+\tgit rev-parse topic_2 >actual &&\n \ttest_cmp expected actual\n '\n \n@@ -567,7 +567,7 @@ test_expect_success 'am --keep-non-patch really keeps the non-patch part' '\n test_expect_success 'setup am -3' '\n \trm -fr .git/rebase-apply &&\n \tgit reset --hard &&\n-\tgit checkout -b base3way master2 &&\n+\tgit checkout -b base3way topic_2 &&\n \tsed -n -e \"3,\\$p\" msg >file &&\n \thead -n 9 msg >>file &&\n \tgit add file &&\ndiff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh\nindex 9d6a46ff56..70a9d2d8ab 100755\n--- a/t/t5515-fetch-merge-logic.sh\n+++ b/t/t5515-fetch-merge-logic.sh\n@@ -15,7 +15,7 @@ export GIT_TEST_PROTOCOL_VERSION\n \n build_script () {\n \tscript=\"$1\" &&\n-\tfor i in one three_file master master2 one_tree three two two2 three2\n+\tfor i in one three_file master topic_2 one_tree three two two2 three2\n \tdo\n \t\techo \"s/$(test_oid --hash=sha1 \"$i\")/$(test_oid \"$i\")/g\" >>\"$script\"\n \tdone\n@@ -52,8 +52,8 @@ test_expect_success setup '\n \ttwo sha1:525b7fb068d59950d185a8779dc957c77eed73ba\n \ttwo sha256:3b21de3440cd38c2a9e9b464adb923f7054949ed4c918e1a0ac4c95cd52774db\n \n-\tmaster2 sha1:754b754407bf032e9a2f9d5a9ad05ca79a6b228f\n-\tmaster2 sha256:6c7abaea8a6d8ef4d89877e68462758dc6774690fbbbb0e6d7dd57415c9abde0\n+\ttopic_2 sha1:754b754407bf032e9a2f9d5a9ad05ca79a6b228f\n+\ttopic_2 sha256:6c7abaea8a6d8ef4d89877e68462758dc6774690fbbbb0e6d7dd57415c9abde0\n \n \ttwo2 sha1:6134ee8f857693b96ff1cc98d3e2fd62b199e5a8\n \ttwo2 sha256:87a2d3ee29c83a3dc7afd41c0606b11f67603120b910a7be7840accdc18344d4\ndiff --git a/t/t5523-push-upstream.sh b/t/t5523-push-upstream.sh\nindex c0df81a014..e47b5db5d6 100755\n--- a/t/t5523-push-upstream.sh\n+++ b/t/t5523-push-upstream.sh\n@@ -41,20 +41,20 @@ test_expect_success 'push -u --dry-run master:otherX' '\n \tcheck_config master upstream refs/heads/other\n '\n \n-test_expect_success 'push -u master2:master2' '\n-\tgit branch master2 &&\n-\tgit push -u upstream master2:master2 &&\n-\tcheck_config master2 upstream refs/heads/master2\n+test_expect_success 'push -u topic_2:topic_2' '\n+\tgit branch topic_2 &&\n+\tgit push -u upstream topic_2:topic_2 &&\n+\tcheck_config topic_2 upstream refs/heads/topic_2\n '\n \n-test_expect_success 'push -u master2:other2' '\n-\tgit push -u upstream master2:other2 &&\n-\tcheck_config master2 upstream refs/heads/other2\n+test_expect_success 'push -u topic_2:other2' '\n+\tgit push -u upstream topic_2:other2 &&\n+\tcheck_config topic_2 upstream refs/heads/other2\n '\n \n-test_expect_success 'push -u :master2' '\n-\tgit push -u upstream :master2 &&\n-\tcheck_config master2 upstream refs/heads/other2\n+test_expect_success 'push -u :topic_2' '\n+\tgit push -u upstream :topic_2 &&\n+\tcheck_config topic_2 upstream refs/heads/other2\n '\n \n test_expect_success 'push -u --all' '\ndiff --git a/t/t6018-rev-list-glob.sh b/t/t6018-rev-list-glob.sh\nindex b31ff7eeec..fe2f3cec3d 100755\n--- a/t/t6018-rev-list-glob.sh\n+++ b/t/t6018-rev-list-glob.sh\n@@ -32,11 +32,11 @@ test_expect_success 'setup' '\n \tgit checkout -b someref master &&\n \tcommit some &&\n \tgit checkout master &&\n-\tcommit master2 &&\n+\tcommit topic_2 &&\n \tgit tag foo/bar master &&\n-\tcommit master3 &&\n+\tcommit topic_3 &&\n \tgit update-ref refs/remotes/foo/baz master &&\n-\tcommit master4 &&\n+\tcommit topic_4 &&\n \tgit update-ref refs/remotes/upstream/one subspace/one &&\n \tgit update-ref refs/remotes/upstream/two subspace/two &&\n \tgit update-ref refs/remotes/upstream/x subspace-x &&\ndiff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh\nindex ad1922b999..50a934e1b2 100755\n--- a/t/t6040-tracking-info.sh\n+++ b/t/t6040-tracking-info.sh\n@@ -264,25 +264,25 @@ test_expect_success 'fail to track annotated tags' '\n test_expect_success '--set-upstream-to does not change branch' '\n \tgit branch from-master master &&\n \tgit branch --set-upstream-to master from-master &&\n-\tgit branch from-master2 master &&\n-\ttest_must_fail git config branch.from-master2.merge > actual &&\n-\tgit rev-list from-master2 &&\n-\tgit update-ref refs/heads/from-master2 from-master2^ &&\n-\tgit rev-parse from-master2 >expect2 &&\n-\tgit branch --set-upstream-to master from-master2 &&\n+\tgit branch from-topic_2 master &&\n+\ttest_must_fail git config branch.from-topic_2.merge > actual &&\n+\tgit rev-list from-topic_2 &&\n+\tgit update-ref refs/heads/from-topic_2 from-topic_2^ &&\n+\tgit rev-parse from-topic_2 >expect2 &&\n+\tgit branch --set-upstream-to master from-topic_2 &&\n \tgit config branch.from-master.merge > actual &&\n-\tgit rev-parse from-master2 >actual2 &&\n+\tgit rev-parse from-topic_2 >actual2 &&\n \tgrep -q \"^refs/heads/master$\" actual &&\n \tcmp expect2 actual2\n '\n \n test_expect_success '--set-upstream-to @{-1}' '\n \tgit checkout follower &&\n-\tgit checkout from-master2 &&\n-\tgit config branch.from-master2.merge > expect2 &&\n+\tgit checkout from-topic_2 &&\n+\tgit config branch.from-topic_2.merge > expect2 &&\n \tgit branch --set-upstream-to @{-1} from-master &&\n \tgit config branch.from-master.merge > actual &&\n-\tgit config branch.from-master2.merge > actual2 &&\n+\tgit config branch.from-topic_2.merge > actual2 &&\n \tgit branch --set-upstream-to follower from-master &&\n \tgit config branch.from-master.merge > expect &&\n \ttest_cmp expect2 actual2 &&\ndiff --git a/t/t6409-merge-subtree.sh b/t/t6409-merge-subtree.sh\nindex 793f0c8bf3..1a0d0e23d0 100755\n--- a/t/t6409-merge-subtree.sh\n+++ b/t/t6409-merge-subtree.sh\n@@ -94,10 +94,10 @@ test_expect_success 'merge update' '\n \techo git-gui2 > git-gui.sh &&\n \to3=$(git hash-object git-gui.sh) &&\n \tgit add git-gui.sh &&\n-\tgit checkout -b master2 &&\n+\tgit checkout -b topic_2 &&\n \tgit commit -m \"update git-gui\" &&\n \tcd ../git &&\n-\tgit pull -s subtree gui master2 &&\n+\tgit pull -s subtree gui topic_2 &&\n \tgit ls-files -s >actual &&\n \t(\n \t\techo \"100644 $o3 0\tgit-gui/git-gui.sh\" &&\n@@ -109,7 +109,7 @@ test_expect_success 'merge update' '\n test_expect_success 'initial ambiguous subtree' '\n \tcd ../git &&\n \tgit reset --hard master &&\n-\tgit checkout -b master2 &&\n+\tgit checkout -b topic_2 &&\n \tgit merge -s ours --no-commit gui/master &&\n \tgit read-tree --prefix=git-gui2/ -u gui/master &&\n \tgit commit -m \"Merge git-gui2 as our subdirectory\" &&\n@@ -125,8 +125,8 @@ test_expect_success 'initial ambiguous subtree' '\n \n test_expect_success 'merge using explicit' '\n \tcd ../git &&\n-\tgit reset --hard master2 &&\n-\tgit pull -Xsubtree=git-gui gui master2 &&\n+\tgit reset --hard topic_2 &&\n+\tgit pull -Xsubtree=git-gui gui topic_2 &&\n \tgit ls-files -s >actual &&\n \t(\n \t\techo \"100644 $o3 0\tgit-gui/git-gui.sh\" &&\n@@ -138,8 +138,8 @@ test_expect_success 'merge using explicit' '\n \n test_expect_success 'merge2 using explicit' '\n \tcd ../git &&\n-\tgit reset --hard master2 &&\n-\tgit pull -Xsubtree=git-gui2 gui master2 &&\n+\tgit reset --hard topic_2 &&\n+\tgit pull -Xsubtree=git-gui2 gui topic_2 &&\n \tgit ls-files -s >actual &&\n \t(\n \t\techo \"100644 $o1 0\tgit-gui/git-gui.sh\" &&\n-- \ngitgitgadget\n\n"},{"id":"406444","messageId":"8d8e9abfe2ad141a75ee54446393f8b54b1fb990.1601154262.git.gitgitgadget@gmail.com","threadId":"54244","inReplyTo":"pull.734.v3.git.1601154262.gitgitgadget@gmail.com","subject":"[PATCH v3 3/5] t3200: avoid variations of the `master` branch name","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-09-26T21:04:20Z","receivedAt":"2020-09-26T21:04:35Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nTo avoid branch names with a loaded history, we already started to avoid\nusing the name \"master\" in a couple instances.\n\nThe `t3200-branch.sh` script uses variations of this name for branches\nother than the default one. So let's change those names, as\n\"lowest-hanging fruits\" in the effort to use more inclusive naming\nthroughout Git's source code. While at it, make those branch names\nindependent from the default branch name.\n\nIn this particular instance, this rename requires a couple of\nnon-trivial adjustments, as the aligned output depends on the maximum\nlength of the displayed branches (which we now changed), and also on the\nalphabetical order (which we now changed, too).\n\nSigned-off-by: Johannes Schindelin \n---\n t/t3200-branch.sh | 34 +++++++++++++++++-----------------\n 1 file changed, 17 insertions(+), 17 deletions(-)\n\ndiff --git a/t/t3200-branch.sh b/t/t3200-branch.sh\nindex 4c0734157b..cc27e3bfdb 100755\n--- a/t/t3200-branch.sh\n+++ b/t/t3200-branch.sh\n@@ -234,10 +234,10 @@ test_expect_success 'git branch -M master master should work when master is chec\n \tgit branch -M master master\n '\n \n-test_expect_success 'git branch -M master2 master2 should work when master is checked out' '\n+test_expect_success 'git branch -M topic topic should work when master is checked out' '\n \tgit checkout master &&\n-\tgit branch master2 &&\n-\tgit branch -M master2 master2\n+\tgit branch topic &&\n+\tgit branch -M topic topic\n '\n \n test_expect_success 'git branch -v -d t should work' '\n@@ -324,8 +324,8 @@ test_expect_success 'git branch --list -v with --abbrev' '\n test_expect_success 'git branch --column' '\n \tCOLUMNS=81 git branch --column=column >actual &&\n \tcat >expect <<\\EOF &&\n- a/b/c bam foo l * master mb o/o q\n- abc bar j/k m/m master2 n o/p r\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 EOF\n \ttest_cmp expect actual\n '\n@@ -346,13 +346,13 @@ test_expect_success 'git branch --column with an extremely long branch name' '\n l\n m/m\n * master\n- master2\n mb\n n\n o/o\n o/p\n q\n r\n+ topic\n $long\n EOF\n \ttest_cmp expect actual\n@@ -365,8 +365,8 @@ test_expect_success 'git branch with column.*' '\n \tgit config --unset column.branch &&\n \tgit config --unset column.ui &&\n \tcat >expect <<\\EOF &&\n- a/b/c bam foo l * master mb o/o q\n- abc bar j/k m/m master2 n o/p r\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 EOF\n \ttest_cmp expect actual\n '\n@@ -377,7 +377,7 @@ test_expect_success 'git branch --column -v should fail' '\n \n test_expect_success 'git branch -v with column.ui ignored' '\n \tgit config column.ui column &&\n-\tCOLUMNS=80 git branch -v | cut -c -10 | sed \"s/ *$//\" >actual &&\n+\tCOLUMNS=80 git branch -v | cut -c -9 | sed \"s/ *$//\" >actual &&\n \tgit config --unset column.ui &&\n \tcat >expect <<\\EOF &&\n a/b/c\n@@ -389,13 +389,13 @@ test_expect_success 'git branch -v with column.ui ignored' '\n l\n m/m\n * master\n- master2\n mb\n n\n o/o\n o/p\n q\n r\n+ topic\n EOF\n \ttest_cmp expect actual\n '\n@@ -597,10 +597,10 @@ test_expect_success 'git branch -C master master should work when master is chec\n \tgit branch -C master master\n '\n \n-test_expect_success 'git branch -C master5 master5 should work when master is checked out' '\n+test_expect_success 'git branch -C main5 main5 should work when master is checked out' '\n \tgit checkout master &&\n-\tgit branch master5 &&\n-\tgit branch -C master5 master5\n+\tgit branch main5 &&\n+\tgit branch -C main5 main5\n '\n \n test_expect_success 'git branch -C ab cd should overwrite existing config for cd' '\n@@ -711,11 +711,11 @@ test_expect_success 'deleting a self-referential symref' '\n '\n \n test_expect_success 'renaming a symref is not allowed' '\n-\tgit symbolic-ref refs/heads/master2 refs/heads/master &&\n-\ttest_must_fail git branch -m master2 master3 &&\n-\tgit symbolic-ref refs/heads/master2 &&\n+\tgit symbolic-ref refs/heads/topic refs/heads/master &&\n+\ttest_must_fail git branch -m topic new-topic &&\n+\tgit symbolic-ref refs/heads/topic &&\n \ttest_path_is_file .git/refs/heads/master &&\n-\ttest_path_is_missing .git/refs/heads/master3\n+\ttest_path_is_missing .git/refs/heads/new-topic\n '\n \n test_expect_success SYMLINKS 'git branch -m u v should fail when the reflog for u is a symlink' '\n-- \ngitgitgadget\n\n"},{"id":"406446","messageId":"a80297f5df1b3ae55716fba6faa6fc30c33f5a11.1601154262.git.gitgitgadget@gmail.com","threadId":"54244","inReplyTo":"pull.734.v3.git.1601154262.gitgitgadget@gmail.com","subject":"[PATCH v3 5/5] t9902: avoid using the branch name `master`","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-09-26T21:04:22Z","receivedAt":"2020-09-26T21:04:36Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin \n\nThe completion tests used that name unnecessarily, and it is a\nnon-inclusive term, so let's avoid using it here.\n\nSince three of the touched test cases make use of the fact that two of\nthe branch names (`master` and `maint`) start with the same letter (or\neven with the same two letters), we choose to replace the use of\n`master` by a name that also has that property: `main`.\n\nSigned-off-by: Johannes Schindelin \n---\n t/t9902-completion.sh | 10 +++++-----\n 1 file changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/t/t9902-completion.sh b/t/t9902-completion.sh\nindex 8425b9a531..7b7bc6e4bd 100755\n--- a/t/t9902-completion.sh\n+++ b/t/t9902-completion.sh\n@@ -542,37 +542,37 @@ test_expect_success '__gitcomp - doesnt fail because of invalid variable name' '\n '\n \n read -r -d \"\" refs <<-\\EOF\n+main\n maint\n-master\n next\n seen\n EOF\n \n test_expect_success '__gitcomp_nl - trailing space' '\n \ttest_gitcomp_nl \"m\" \"$refs\" <<-EOF\n+\tmain Z\n \tmaint Z\n-\tmaster Z\n \tEOF\n '\n \n test_expect_success '__gitcomp_nl - prefix' '\n \ttest_gitcomp_nl \"--fixup=m\" \"$refs\" \"--fixup=\" \"m\" <<-EOF\n+\t--fixup=main Z\n \t--fixup=maint Z\n-\t--fixup=master Z\n \tEOF\n '\n \n test_expect_success '__gitcomp_nl - suffix' '\n \ttest_gitcomp_nl \"branch.ma\" \"$refs\" \"branch.\" \"ma\" \".\" <<-\\EOF\n+\tbranch.main.Z\n \tbranch.maint.Z\n-\tbranch.master.Z\n \tEOF\n '\n \n test_expect_success '__gitcomp_nl - no suffix' '\n \ttest_gitcomp_nl \"ma\" \"$refs\" \"\" \"ma\" \"\" <<-\\EOF\n+\tmainZ\n \tmaintZ\n-\tmasterZ\n \tEOF\n '\n \n-- \ngitgitgadget\n"},{"id":"406484","messageId":"20200927084535.GB2465822@coredump.intra.peff.net","threadId":"54244","inReplyTo":"nycvar.QRO.7.76.6.2009260629120.50@tvgsbejvaqbjf.bet","subject":"Re: [PATCH v2 0/5] Inclusive naming, part II","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2020-09-27T08:45:35Z","receivedAt":"2020-09-27T08:45:38Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sat, Sep 26, 2020 at 06:29:50AM +0200, Johannes Schindelin wrote:\n\n> > Thanks, I think that does look nicer. Shouldn't the latter bullet apply\n> > to most of the ones in patch 4, though?\n> >\n> > I wonder if they should simply be \"s/master/topic/\" instead of\n> > \"s/master/main\".\n> \n> Yes! I did that in 4/5. In 5/5, we need a branch name that starts with the\n> same two letters as `maint`, though. I amended the commit message\n> accordingly.\n\nThat makes sense, and your commit message is clear. All of your v3 looks\ngood to me. Thanks for your patience on these rather tedious changes. :)\n\n-Peff\n"},{"id":"406722","messageId":"xmqqimbugb3l.fsf@gitster.c.googlers.com","threadId":"54244","inReplyTo":"pull.734.v3.git.1601154262.gitgitgadget@gmail.com","subject":"Re: [PATCH v3 0/5] Inclusive naming, part II","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-09-30T22:21:02Z","receivedAt":"2020-09-30T22:21:14Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Johannes Schindelin via GitGitGadget\" \nwrites:\n\n> This patch series represents the logical next step on the journey begun with\n> introducing init.defaultBranch: in these patches, we avoid a couple\n> unnecessary mentions of the branch name \"master\".\n>\n> This patch series does not try to change the default branch name, although I\n> have that patch series ready to go. You can see the overall idea here: \n> https://github.com/gitgitgadget/git/pull/655. Concretely, I plan on\n> submitting three more patch series after this one:\n>\n> 1. a relatively small patch series to avoid using the branch name main in\n> the test suite. This is necessary because my plan is to change the\n> default branch name to that name, therefore it cannot be used as the\n> name of a topic branch any longer.\n> 2. a relatively large patch series (currently consisting of 18 patches) to\n> change the default branch name to main. Most of the patches provide\n> non-trivial (read: non-scriptable) adjustments to the test suite in an\n> incremental fashion, with a big patch toward the end that reflects a\n> fully-automated search-and-replace of all the trivial cases.\n> 3. a very small patch series with fall-out patches that are not necessary\n> to pass the test suite, but are still required to complete the rename\n> (adjusted code comment, file rename).\n>\n> (Note: I am still debating whether I should move one or two patches from the\n> second to the third patch series)\n>\n> Changes since v2:\n>\n> * Extended the idea of using topic instead of main to patch 4/5.\n> * Explained in the commit message of patch 5/5 why we cannot use topic \n> instead of main here.\n\nThis round hasn't seen any new comments. I quickly scanned them one\nmore time, and it seems to be in good shape.\n\nShall we merge it down to 'next'?\n\nThanks.\n\n"},{"id":"406725","messageId":"20200930223451.GA1908000@coredump.intra.peff.net","threadId":"54244","inReplyTo":"xmqqimbugb3l.fsf@gitster.c.googlers.com","subject":"Re: [PATCH v3 0/5] Inclusive naming, part II","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2020-09-30T22:34:51Z","receivedAt":"2020-09-30T22:34:54Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Sep 30, 2020 at 03:21:02PM -0700, Junio C Hamano wrote:\n\n> > Changes since v2:\n> >\n> > * Extended the idea of using topic instead of main to patch 4/5.\n> > * Explained in the commit message of patch 5/5 why we cannot use topic \n> > instead of main here.\n> \n> This round hasn't seen any new comments. I quickly scanned them one\n> more time, and it seems to be in good shape.\n> \n> Shall we merge it down to 'next'?\n\nI had an \"all of v3 looks good to me\" comment, but it was perhaps a bit\nburied. So yes, I think this is ready for 'next'.\n\n-Peff\n"},{"id":"406730","messageId":"xmqq1riig9ei.fsf@gitster.c.googlers.com","threadId":"54244","inReplyTo":"20200930223451.GA1908000@coredump.intra.peff.net","subject":"Re: [PATCH v3 0/5] Inclusive naming, part II","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-09-30T22:57:41Z","receivedAt":"2020-09-30T22:57:47Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> On Wed, Sep 30, 2020 at 03:21:02PM -0700, Junio C Hamano wrote:\n>\n>> > Changes since v2:\n>> >\n>> > * Extended the idea of using topic instead of main to patch 4/5.\n>> > * Explained in the commit message of patch 5/5 why we cannot use topic \n>> > instead of main here.\n>> \n>> This round hasn't seen any new comments. I quickly scanned them one\n>> more time, and it seems to be in good shape.\n>> \n>> Shall we merge it down to 'next'?\n>\n> I had an \"all of v3 looks good to me\" comment, but it was perhaps a bit\n> buried. So yes, I think this is ready for 'next'.\n\nAh, thanks and sorry for a confusing comment. I meant by \"new\ncomments\" messages that point out issues yet to be addressed.\n\n"}]}