Re: [PATCH 4/6] t6423: fix missed staging of file in testcases 12i,12j,12k
From: Patrick Steinhardt <hidden>
Date: 2025-08-05 04:39:04
On Mon, Aug 04, 2025 at 12:23:49PM -0700, Elijah Newren wrote:
On Fri, Aug 1, 2025 at 1:31 AM Patrick Steinhardt [off-list ref] wrote:quoted
On Tue, Jul 22, 2025 at 03:23:09PM +0000, Elijah Newren via GitGitGadget wrote:quoted
diff --git a/t/t6423-merge-rename-directories.sh b/t/t6423-merge-rename-directories.sh index 69de7a3b84af..c2032eb6cfa1 100755 --- a/t/t6423-merge-rename-directories.sh +++ b/t/t6423-merge-rename-directories.sh@@ -5114,7 +5117,7 @@ test_expect_failure '12n: Directory rename transitively makes rename back to sel grep "CONFLICT (file location).*should perhaps be moved" out && # Should have 1 entry for hello, and 1 for world - test_stdout_line_count = 2 git ls-files -s && + test_stdout_line_count = 3 git ls-files -s && test_stdout_line_count = 1 git ls-files -s hello && test_stdout_line_count = 2 git ls-files -s world )Should we also explicitly check `git ls-files -s baz`?Why? There was no baz in this testcase -- not only did it not appear in the final commit, it didn't appear in either branch being merged nor anywhere in the entire history of the repository. Testcases 12{i,j,k} all had such a file, but testcase 12n does not.
Mostly because the line count was adjusted, so it seems clear to me that "baz" at least plays a role here. Otherwise there's a mismatch between the number of lines we see and the state of files we verify. Patrick