git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 5/5] t9902: avoid using the branch name `master`

From
Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
Date
Sep 21, 2020, 22:01 UTC
Message-ID
<c2c1238b5d9dde684d100fa99437a813140cd615.1600725687.git.gitgitgadget@gmail.com>
In-Reply-To
<pull.734.v2.git.1600725687.gitgitgadget@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>

The completion tests used that name unnecessarily, and it is a non-inclusive term, so let's avoid using it here.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t9902-completion.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index 8425b9a531..7b7bc6e4bd 100755
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -542,37 +542,37 @@ test_expect_success '__gitcomp - doesnt fail because of invalid variable name' '
 '
 
 read -r -d "" refs <<-\EOF
+main
 maint
-master
 next
 seen
 EOF
 
 test_expect_success '__gitcomp_nl - trailing space' '
 	test_gitcomp_nl "m" "$refs" <<-EOF
+	main Z
 	maint Z
-	master Z
 	EOF
 '
 
 test_expect_success '__gitcomp_nl - prefix' '
 	test_gitcomp_nl "--fixup=m" "$refs" "--fixup=" "m" <<-EOF
+	--fixup=main Z
 	--fixup=maint Z
-	--fixup=master Z
 	EOF
 '
 
 test_expect_success '__gitcomp_nl - suffix' '
 	test_gitcomp_nl "branch.ma" "$refs" "branch." "ma" "." <<-\EOF
+	branch.main.Z
 	branch.maint.Z
-	branch.master.Z
 	EOF
 '
 
 test_expect_success '__gitcomp_nl - no suffix' '
 	test_gitcomp_nl "ma" "$refs" "" "ma" "" <<-\EOF
+	mainZ
 	maintZ
-	masterZ
 	EOF
 '
 
-- 
gitgitgadget
Previous: Johannes SchindelinNext: Junio C Hamano
Message 23 of 38 in “Inclusive naming, part II”
  1. 0/5 Inclusive naming, part IIJohannes Schindelin via GitGitGadget, Sep 16, 2020
  2. 3/5 t3200: avoid variations of the `master` branch nameJohannes Schindelin via GitGitGadget, Sep 16, 2020
  3. Jeff KingSep 16, 2020
  4. Junio C HamanoSep 16, 2020
  5. Jeff KingSep 16, 2020
  6. Johannes SchindelinSep 20, 2020
  7. Junio C HamanoSep 21, 2020
  8. 4/5 tests: avoid variations of the `master` branch nameJohannes Schindelin via GitGitGadget, Sep 16, 2020
  9. 5/5 t9902: avoid using the branch name `master`Johannes Schindelin via GitGitGadget, Sep 16, 2020
  10. 2/5 t/test-terminal: avoid non-inclusive languageJohannes Schindelin via GitGitGadget, Sep 16, 2020
  11. Junio C HamanoSep 16, 2020
  12. Junio C HamanoSep 16, 2020
  13. Johannes SchindelinSep 20, 2020
  14. Junio C HamanoSep 21, 2020
  15. 1/5 fast-export: avoid using unnecessary language in a code commentJohannes Schindelin via GitGitGadget, Sep 16, 2020
  16. Junio C HamanoSep 16, 2020
  17. 0/5 Inclusive naming, part IIJohannes Schindelin via GitGitGadget, Sep 21, 2020
  18. 1/5 fast-export: avoid using unnecessary language in a code commentJohannes Schindelin via GitGitGadget, Sep 21, 2020
  19. 3/5 t3200: avoid variations of the `master` branch nameJohannes Schindelin via GitGitGadget, Sep 21, 2020
  20. 4/5 tests: avoid variations of the `master` branch nameJohannes Schindelin via GitGitGadget, Sep 21, 2020
  21. Junio C HamanoSep 21, 2020
  22. Johannes SchindelinSep 26, 2020
  23. 5/5 t9902: avoid using the branch name `master`Johannes Schindelin via GitGitGadget, Sep 21, 2020
  24. Junio C HamanoSep 21, 2020
  25. Johannes SchindelinSep 26, 2020
  26. 2/5 t/test-terminal: avoid non-inclusive languageJohannes Schindelin via GitGitGadget, Sep 21, 2020
  27. Jeff KingSep 21, 2020
  28. Johannes SchindelinSep 26, 2020
  29. Jeff KingSep 27, 2020
  30. 0/5 Inclusive naming, part IIJohannes Schindelin via GitGitGadget, Sep 26, 2020
  31. 1/5 fast-export: avoid using unnecessary language in a code commentJohannes Schindelin via GitGitGadget, Sep 26, 2020
  32. 2/5 t/test-terminal: avoid non-inclusive languageJohannes Schindelin via GitGitGadget, Sep 26, 2020
  33. 4/5 tests: avoid variations of the `master` branch nameJohannes Schindelin via GitGitGadget, Sep 26, 2020
  34. 3/5 t3200: avoid variations of the `master` branch nameJohannes Schindelin via GitGitGadget, Sep 26, 2020
  35. 5/5 t9902: avoid using the branch name `master`Johannes Schindelin via GitGitGadget, Sep 26, 2020
  36. Junio C HamanoSep 30, 2020
  37. Jeff KingSep 30, 2020
  38. Junio C HamanoSep 30, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.