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

Re: [PATCH 06/10] t5703: adjust a test case for the upcoming default branch name

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 21, 2020, 22:34 UTC
Message-ID
<xmqqlffz439g.fsf@gitster.c.googlers.com>
In-Reply-To
<0d2511d18fb2908b1049afe4da7494f6ed7e26e8.1603135903.git.gitgitgadget@gmail.com>

"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> writes:

Show 8 quoted lines
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> We want to rename the default branch name used by `git init` in the near
> future, using `main` as the new name.
>
> In preparation for that, we adjust a test case that wants to rename the
> default branch to a different name that however has the same length. We
> use `none` as that name because it matches the length of `main`.

The original chose word that not only is the same length but is similarly spell (master vs raster). Perhaps mirroring that arrangement and picking 'rain' would have been even a better taste, but this is good enough ;-)

The test pieces in this script seem to be arranged to be mostly independent from each other, and especially because this one is at the end of the script, making it run only when 'main' is in use, and skipping otherwise, would not hurt anybody else. We just need to make sure that nobody adds new tests after this one that may be affected by the allowRefInWant configuration setting.

Looking good.
Thanks.
Show 14 quoted lines
> -test_expect_success 'server loses a ref - ref in want' '
> +test_expect_success PREPARE_FOR_MAIN_BRANCH 'server loses a ref - ref in want' '
>  	git -C "$REPO" config uploadpack.allowRefInWant true &&
>  	rm -rf local &&
>  	cp -r "$LOCAL_PRISTINE" local &&
> -	echo "s/master/raster/" >"$HTTPD_ROOT_PATH/one-time-perl" &&
> +	echo "s/main/none/" >"$HTTPD_ROOT_PATH/one-time-perl" &&
>  	test_must_fail git -C local fetch 2>err &&
>  
> -	test_i18ngrep "fatal: remote error: unknown ref refs/heads/raster" err
> +	test_i18ngrep "fatal: remote error: unknown ref refs/heads/none" err
>  '
>  
>  # DO NOT add non-httpd-specific tests here, because the last part of this
Previous: Johannes Schindelin via GitGitGadgetNext: Johannes Schindelin via GitGitGadget
Message 13 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.