@matheusbsbs / matheus-bagliano / commits / db5015acc4

t6423: fix missed staging of file in testcases 12i,12j,12k

Commit 806f83287f8d (t6423: test directory renames causing rename-to-self, 2021-06-30) introduced testcase 12i-12k but omitted staging one of the files and copy-pasted that mistake to the other tests. This means the merge runs with an unstaged change, even though that isn't related to what is being tested and makes the test look more complicated than it is. The cover letter for the series associated with the above commit (see Message-ID: pull.1039.git.git.1624727121.gitgitgadget@gmail.com) noted that these testcases triggered two bugs in merge-recursive but only one in merge-ort; in merge-recursive these testcases also triggered a silent deletion of the file in question when it shouldn't be deleted. What I didn't realize at the time was that the deletion bug in merge-ort was merely being sidestepped by the "relevant renames" optimization but can actually be triggered. A subsequent commit will deal with that additional bug, but it was complicated by the mistaken forgotten staging, so this commit first fixes that issue. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Elijah Newren committed Aug 6, 2025 at 23:15 UTC db5015acc463668735bc7b95e1ca6415fd7948d3
1 file changed +6 -3
t/t6423-merge-rename-directories.sh
+6 -3
@@ -4747,6 +4747,7 @@ test_setup_12i () {
4747 git switch B &&
4748 git mv source/bar source/subdir/bar &&
4749 echo more baz >>source/baz &&
4750 + git add source/baz &&
4751 git commit -m B
4752 )
4753 }
@@ -4771,7 +4772,7 @@ test_expect_success '12i: Directory rename causes rename-to-self' '
4772 git status --porcelain -uno >actual &&
4773 cat >expect <<-\EOF &&
4774 UU source/bar
4774 - M source/baz
4775 + M source/baz
4776 EOF
4777 test_cmp expect actual
4778 )
@@ -4806,6 +4807,7 @@ test_setup_12j () {
4807 git switch B &&
4808 git mv bar subdir/bar &&
4809 echo more baz >>baz &&
4810 + git add baz &&
4811 git commit -m B
4812 )
4813 }
@@ -4830,7 +4832,7 @@ test_expect_success '12j: Directory rename to root causes rename-to-self' '
4832 git status --porcelain -uno >actual &&
4833 cat >expect <<-\EOF &&
4834 UU bar
4833 - M baz
4835 + M baz
4836 EOF
4837 test_cmp expect actual
4838 )
@@ -4865,6 +4867,7 @@ test_setup_12k () {
4867 git switch B &&
4868 git mv dirA/bar dirB/bar &&
4869 echo more baz >>dirA/baz &&
4870 + git add dirA/baz &&
4871 git commit -m B
4872 )
4873 }
@@ -4889,7 +4892,7 @@ test_expect_success '12k: Directory rename with sibling causes rename-to-self' '
4892 git status --porcelain -uno >actual &&
4893 cat >expect <<-\EOF &&
4894 UU dirA/bar
4892 - M dirA/baz
4895 + M dirA/baz
4896 EOF
4897 test_cmp expect actual
4898 )