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

[PATCH v2 9/9] t1400: prepare for `main` being default branch name

From
Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
Date
Oct 23, 2020, 14:00 UTC
Message-ID
<e542010fdde91256566b7129e1526b749500842a.1603461606.git.gitgitgadget@gmail.com>
In-Reply-To
<pull.758.v2.git.1603461606.gitgitgadget@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>

In addition to the trivial search-and-replace, there are three non-trivial adjustments necessary.

Mark the respective test cases with the transitional prereq and make those non-trivial adjustments early, to make this change easier to review.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t1400-update-ref.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
index 770e7be363..4c01e08551 100755
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
@@ -585,10 +585,10 @@ test_expect_success 'stdin fails on unbalanced quotes' '
 	grep "fatal: badly quoted argument: \\\"master" err
 '
 
-test_expect_success 'stdin fails on invalid escape' '
-	echo "create $a \"ma\zter\"" >stdin &&
+test_expect_success PREPARE_FOR_MAIN_BRANCH 'stdin fails on invalid escape' '
+	echo "create $a \"ma\zn\"" >stdin &&
 	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: badly quoted argument: \\\"ma\\\\zter\\\"" err
+	grep "fatal: badly quoted argument: \\\"ma\\\\zn\\\"" err
 '
 
 test_expect_success 'stdin fails on junk after quoted argument' '
@@ -704,9 +704,9 @@ test_expect_success 'stdin succeeds with quoted argument' '
 	test_cmp expect actual
 '
 
-test_expect_success 'stdin succeeds with escaped character' '
+test_expect_success PREPARE_FOR_MAIN_BRANCH 'stdin succeeds with escaped character' '
 	git update-ref -d $a &&
-	echo "create $a \"ma\\163ter\"" >stdin &&
+	echo "create $a \"ma\\151n\"" >stdin &&
 	git update-ref --stdin <stdin &&
 	git rev-parse $m >expect &&
 	git rev-parse $a >actual &&
-- 
gitgitgadget
Previous: Johannes Schindelin via GitGitGadgetNext: Johannes Schindelin via GitGitGadget
Message 33 of 35 in “Prepare for changing the default branch name main (last manual part)”
  1. 00/10 Prepare for changing the default branch name main (last manual part)Johannes Schindelin via GitGitGadget, Oct 19, 2020
  2. 01/10 fmt-merge-msg: also suppress "into main" by defaultJohannes Schindelin via GitGitGadget, Oct 19, 2020
  3. Junio C HamanoOct 21, 2020
  4. Johannes SchindelinOct 22, 2020
  5. 02/10 t9801: use `--` in preparation for default branch renameJohannes Schindelin via GitGitGadget, Oct 19, 2020
  6. Junio C HamanoOct 21, 2020
  7. 03/10 tests: start moving to a different default main branch nameJohannes Schindelin via GitGitGadget, Oct 19, 2020
  8. Junio C HamanoOct 21, 2020
  9. 05/10 t6200: adjust suppression pattern to also match "main"Johannes Schindelin via GitGitGadget, Oct 19, 2020
  10. Junio C HamanoOct 21, 2020
  11. Johannes SchindelinOct 22, 2020
  12. 06/10 t5703: adjust a test case for the upcoming default branch nameJohannes Schindelin via GitGitGadget, Oct 19, 2020
  13. Junio C HamanoOct 21, 2020
  14. 07/10 t3200: prepare for `main` being shorter than `master`Johannes Schindelin via GitGitGadget, Oct 19, 2020
  15. Junio C HamanoOct 21, 2020
  16. Johannes SchindelinOct 22, 2020
  17. 04/10 t4013: prepare for the new default branch name "main"Johannes Schindelin via GitGitGadget, Oct 19, 2020
  18. Junio C HamanoOct 21, 2020
  19. Johannes SchindelinOct 22, 2020
  20. 09/10 tests: prepare aligned mentions of the default branch nameJohannes Schindelin via GitGitGadget, Oct 19, 2020
  21. 08/10 t9902: prepare a test for the upcoming default branch nameJohannes Schindelin via GitGitGadget, Oct 19, 2020
  22. 10/10 t1400: prepare for `main` being default branch nameJohannes Schindelin via GitGitGadget, Oct 19, 2020
  23. Junio C HamanoOct 21, 2020
  24. Johannes SchindelinOct 22, 2020
  25. 0/9 Prepare for changing the default branch name main (last manual part)Johannes Schindelin via GitGitGadget, Oct 23, 2020
  26. 1/9 fmt-merge-msg: also suppress "into main" by defaultJohannes Schindelin via GitGitGadget, Oct 23, 2020
  27. 2/9 t9801: use `--` in preparation for default branch renameJohannes Schindelin via GitGitGadget, Oct 23, 2020
  28. 3/9 tests: start moving to a different default main branch nameJohannes Schindelin via GitGitGadget, Oct 23, 2020
  29. 4/9 t6200: adjust suppression pattern to also match "main"Johannes Schindelin via GitGitGadget, Oct 23, 2020
  30. 7/9 t9902: prepare a test for the upcoming default branch nameJohannes Schindelin via GitGitGadget, Oct 23, 2020
  31. 6/9 t3200: prepare for `main` being shorter than `master`Johannes Schindelin via GitGitGadget, Oct 23, 2020
  32. 5/9 t5703: adjust a test case for the upcoming default branch nameJohannes Schindelin via GitGitGadget, Oct 23, 2020
  33. 9/9 t1400: prepare for `main` being default branch nameJohannes Schindelin via GitGitGadget, Oct 23, 2020
  34. 8/9 tests: prepare aligned mentions of the default branch nameJohannes Schindelin via GitGitGadget, Oct 23, 2020
  35. Junio C HamanoOct 23, 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.