Re: [PATCH 4/6] t6423: fix missed staging of file in testcases 12i,12j,12k

From: Elijah Newren <newren@gmail.com>
Date: Aug 4, 2025, 19:23 UTC
Message-ID: <CABPp-BF36TtAaqbV01m82Cj_7Mr23P1DEuSTR7oM9odLbD9q5g@mail.gmail.com>
In-Reply-To: <aIx7Qp_epPOpk8OF@pks.im>

On Fri, Aug 1, 2025 at 1:31 AM Patrick Steinhardt <ps@pks.im> wrote:

Show 14 quoted lines

>
> On Tue, Jul 22, 2025 at 03:23:09PM +0000, Elijah Newren via GitGitGadget wrote:
> > From: Elijah Newren <newren@gmail.com>
> >
> > 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 noted
>
> It might be a good idea to provide the message ID of that cover letter.

Sounds like a good idea; will do.

Show 15 quoted lines

> > 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.