From: Patrick Steinhardt <ps@pks•im>
To: Elijah Newren <newren@gmail•com>
Cc: Elijah Newren via GitGitGadget <gitgitgadget@gmail•com>,
git@vger•kernel.org
Subject: Re: [PATCH 4/6] t6423: fix missed staging of file in testcases 12i,12j,12k
Date: Tue, 5 Aug 2025 06:38:58 +0200 [thread overview]
Message-ID: <aJGK4tSCkWgBK32Q@pks.im> (raw)
In-Reply-To: <CABPp-BF36TtAaqbV01m82Cj_7Mr23P1DEuSTR7oM9odLbD9q5g@mail.gmail.com>
On Mon, Aug 04, 2025 at 12:23:49PM -0700, Elijah Newren wrote:
> On Fri, Aug 1, 2025 at 1:31 AM Patrick Steinhardt <ps@pks•im> wrote:
> > On Tue, Jul 22, 2025 at 03:23:09PM +0000, Elijah Newren via GitGitGadget wrote:
> > > 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
next prev parent reply other threads:[~2025-08-05 4:39 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-22 15:23 [PATCH 0/6] Fix various rename corner cases Elijah Newren via GitGitGadget
2025-07-22 15:23 ` [PATCH 1/6] merge-ort: update comments to modern testfile location Elijah Newren via GitGitGadget
2025-07-22 15:23 ` [PATCH 2/6] merge-ort: drop unnecessary temporary in check_for_directory_rename() Elijah Newren via GitGitGadget
2025-07-22 15:23 ` [PATCH 3/6] t6423: document two bugs with rename-to-self testcases Elijah Newren via GitGitGadget
2025-08-01 8:30 ` Patrick Steinhardt
2025-08-04 19:15 ` Elijah Newren
2025-08-05 4:38 ` Patrick Steinhardt
2025-08-05 18:33 ` Elijah Newren
2025-07-22 15:23 ` [PATCH 4/6] t6423: fix missed staging of file in testcases 12i,12j,12k Elijah Newren via GitGitGadget
2025-08-01 8:30 ` Patrick Steinhardt
2025-08-04 19:23 ` Elijah Newren
2025-08-05 4:38 ` Patrick Steinhardt [this message]
2025-08-05 18:33 ` Elijah Newren
2025-07-22 15:23 ` [PATCH 5/6] merge-ort: fix incorrect file handling Elijah Newren via GitGitGadget
2025-08-01 8:31 ` Patrick Steinhardt
2025-08-04 22:08 ` Elijah Newren
2025-08-05 4:39 ` Patrick Steinhardt
2025-08-05 18:34 ` Elijah Newren
2025-07-22 15:23 ` [PATCH 6/6] merge-ort: fix directory rename on top of source of other rename/delete Elijah Newren via GitGitGadget
2025-08-01 8:31 ` Patrick Steinhardt
2025-08-04 22:33 ` Elijah Newren
2025-08-01 8:31 ` [PATCH 0/6] Fix various rename corner cases Patrick Steinhardt
2025-08-05 19:35 ` [PATCH v2 " Elijah Newren via GitGitGadget
2025-08-05 19:35 ` [PATCH v2 1/6] merge-ort: update comments to modern testfile location Elijah Newren via GitGitGadget
2025-08-05 19:35 ` [PATCH v2 2/6] merge-ort: drop unnecessary temporary in check_for_directory_rename() Elijah Newren via GitGitGadget
2025-08-05 19:35 ` [PATCH v2 3/6] t6423: document two bugs with rename-to-self testcases Elijah Newren via GitGitGadget
2025-08-05 19:35 ` [PATCH v2 4/6] t6423: fix missed staging of file in testcases 12i,12j,12k Elijah Newren via GitGitGadget
2025-08-05 19:35 ` [PATCH v2 5/6] merge-ort: fix incorrect file handling Elijah Newren via GitGitGadget
2025-08-05 19:35 ` [PATCH v2 6/6] merge-ort: fix directory rename on top of source of other rename/delete Elijah Newren via GitGitGadget
2025-08-05 20:18 ` Junio C Hamano
2025-08-05 20:47 ` Elijah Newren
2025-08-06 23:15 ` [PATCH v3 0/7] Fix various rename corner cases Elijah Newren via GitGitGadget
2025-08-06 23:15 ` [PATCH v3 1/7] merge-ort: update comments to modern testfile location Elijah Newren via GitGitGadget
2025-08-06 23:15 ` [PATCH v3 2/7] merge-ort: drop unnecessary temporary in check_for_directory_rename() Elijah Newren via GitGitGadget
2025-08-06 23:15 ` [PATCH v3 3/7] t6423: document two bugs with rename-to-self testcases Elijah Newren via GitGitGadget
2025-08-06 23:15 ` [PATCH v3 4/7] t6423: fix missed staging of file in testcases 12i,12j,12k Elijah Newren via GitGitGadget
2025-08-06 23:15 ` [PATCH v3 5/7] merge-ort: clarify the interning of strings in opt->priv->path Elijah Newren via GitGitGadget
2025-08-06 23:15 ` [PATCH v3 6/7] merge-ort: fix incorrect file handling Elijah Newren via GitGitGadget
2025-08-06 23:15 ` [PATCH v3 7/7] merge-ort: fix directory rename on top of source of other rename/delete 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=aJGK4tSCkWgBK32Q@pks.im \
--to=ps@pks$(echo .)im \
--cc=git@vger$(echo .)kernel.org \
--cc=gitgitgadget@gmail$(echo .)com \
--cc=newren@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox