From: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>, Elijah Newren <newren@gmail.com>
Subject: [PATCH 2/5] t6423: fix a comment that accidentally reversed two commits
Date: Sun, 16 Mar 2025 06:58:56 +0000 [thread overview]
Message-ID: <0d42acaf5d45cd205abeb848670017d7253ab7ba.1742108339.git.gitgitgadget@gmail.com> (raw)
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
next prev parent reply other threads:[~2025-03-16 6:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-16 6:58 [PATCH 0/5] Miscellaneous fixups preparing for the removal of merge-recursive Elijah Newren via GitGitGadget
2025-03-16 6:58 ` [PATCH 1/5] stash: remove merge-recursive.h include Elijah Newren via GitGitGadget
2025-03-16 6:58 ` Elijah Newren via GitGitGadget [this message]
2025-03-16 6:58 ` [PATCH 3/5] t7615: be more explicit about diff algorithm used Elijah Newren via GitGitGadget
2025-03-16 6:58 ` [PATCH 4/5] merge-ort: fix accidental strset<->strintmap Elijah Newren via GitGitGadget
2025-03-16 6:58 ` [PATCH 5/5] merge-ort: remove extraneous word in comment Elijah Newren via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0d42acaf5d45cd205abeb848670017d7253ab7ba.1742108339.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.