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

Re: [PATCH 02/10] t9801: use `--` in preparation for default branch rename

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 21, 2020, 22:19 UTC
Message-ID
<xmqq36275ij5.fsf@gitster.c.googlers.com>
In-Reply-To
<5849eda331e09732026f0432cf1040a4e973a702.1603135902.git.gitgitgadget@gmail.com>

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

Show 6 quoted lines
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> Seeing as we want to use `main` as the new default branch name used by
> `git init`, and that `main` is used as directory name in t9801, let's
> tighten the rev-list arguments to make it explicit when we are referring
> to a ref instead of a directory.

Interesting. s/master/main/g would introduce "that name is both a revision and a path" ambiguity? An obvious alternative would be to use a word that is not 'main' or 'master' for the path and that way we will keep the current property that tests do not have to worry about the rev/path ambiguity. But given that even "git p4" should be safe against rev/path ambiguity, I think this is good in the long run---if "git p4" is not prepared to handle the ambiguity correctly, then this approach may reveal such an existing breakage when the branch name 'master' is replaced with 'main', and at that point, we have to scramble and fix it (or rename the path from 'main' to something else as a workaround).

Looking good.
Previous: Johannes Schindelin via GitGitGadgetNext: Johannes Schindelin via GitGitGadget
Message 6 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.