kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

t6423: fix a comment that accidentally reversed two commits 

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Elijah Newren 2025-03-16 06:58:56 +00:00 committed by Junio C Hamano
parent e40eefba02
commit 9c69ad275e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
t/t6423-merge-rename-directories.sh
View File

@ -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 () {