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

[PATCH 2/5] t6423: fix a comment that accidentally reversed two commits

From
Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>
Date
Mar 16, 2025, 06:58 UTC
Message-ID
<0d42acaf5d45cd205abeb848670017d7253ab7ba.1742108339.git.gitgitgadget@gmail.com>
In-Reply-To
<pull.1882.git.1742108339.gitgitgadget@gmail.com>
From: Elijah Newren <newren@gmail.com>

The comment describing testcase 13b of t6423 somehow mixed up commits A and B in one paragraph. Fix the references.

Signed-off-by: Elijah Newren <newren@gmail.com>
---
 t/t6423-merge-rename-directories.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t6423-merge-rename-directories.sh b/t/t6423-merge-rename-directories.sh
index 94080c65d12..ebf47cdd6b2 100755
--- a/t/t6423-merge-rename-directories.sh
+++ b/t/t6423-merge-rename-directories.sh
@@ -5549,9 +5549,9 @@ test_expect_success '13b(info): messages for transitive rename with conflicted c
 #   Commit A: y/{b,c,d}, x/e
 #   Commit B: z/{b,c,d}, x/e
 #   Expected: y/{b,c,d}, x/e, with info or conflict messages for d
-#             A: renamed x/d -> z/d; B: renamed z/ -> y/ AND renamed x/d to y/d
-#             One could argue A had partial knowledge of what was done with
-#             d and B had full knowledge, but that's a slippery slope as
+#             B: renamed x/d -> z/d; A: renamed z/ -> y/ AND renamed x/d to y/d
+#             One could argue B had partial knowledge of what was done with
+#             d and A had full knowledge, but that's a slippery slope as
 #             shown in testcase 13d.
 
 test_setup_13c () {
-- 
gitgitgadget
Previous: Elijah Newren via GitGitGadgetNext: Elijah Newren via GitGitGadget
Message 3 of 6 in “Miscellaneous fixups preparing for the removal of merge-recursive”
  1. 0/5 Miscellaneous fixups preparing for the removal of merge-recursiveElijah Newren via GitGitGadget, Mar 16, 2025
  2. 1/5 stash: remove merge-recursive.h includeElijah Newren via GitGitGadget, Mar 16, 2025
  3. 2/5 t6423: fix a comment that accidentally reversed two commitsElijah Newren via GitGitGadget, Mar 16, 2025
  4. 3/5 t7615: be more explicit about diff algorithm usedElijah Newren via GitGitGadget, Mar 16, 2025
  5. 4/5 merge-ort: fix accidental strset<->strintmapElijah Newren via GitGitGadget, Mar 16, 2025
  6. 5/5 merge-ort: remove extraneous word in commentElijah Newren via GitGitGadget, Mar 16, 2025

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.