Re: [PATCH v2] merge-ort: avoid assuming all renames detected

From: Elijah Newren <newren@gmail.com>
Date: Jul 1, 2022, 05:21 UTC
Message-ID: <CABPp-BHSJqt9+cutx5qppdT6vuQFUqCoBsmfqdGj3vzh4Z_sVg@mail.gmail.com>
In-Reply-To: <CABPp-BG1MARvcqgPYBNQ0P1M9jZ2b8vt9btPG1oQ5_h_YM78TQ@mail.gmail.com>

On Thu, Jun 30, 2022 at 7:30 PM Elijah Newren <newren@gmail.com> wrote:

Show 8 quoted lines

>
> On Thu, Jun 30, 2022 at 2:54 AM SZEDER Gábor <szeder.dev@gmail.com> wrote:
> >
> > On Mon, Jan 17, 2022 at 06:25:55PM +0000, Elijah Newren via GitGitGadget wrote:
> > > diff --git a/t/t6429-merge-sequence-rename-caching.sh b/t/t6429-merge-sequence-rename-caching.sh
> > > index 035edc40b1e..f2bc8a7d2a2 100755
> > > --- a/t/t6429-merge-sequence-rename-caching.sh
> > > +++ b/t/t6429-merge-sequence-rename-caching.sh

[...]

Show 14 quoted lines

> > > +             git ls-files -u >actual &&
> > > +             ! test_file_is_empty actual
> >
> > There is no 'test_file_is_empty' function, but because of the ! at the
> > beginning of the line it didn't fail the test.
>
> Oops, looks like I meant test_must_be_empty.
>
> > The minimal fix would be to use 'test_file_not_empty' instead, but I
> > wonder whether we should use 'test_line_count = 2' instead for a tad
> > tighter check.
>
> Makes sense; since this merged about half a year ago, I'll submit a
> new patch to fix this.  Thanks for catching and pointing it out!

Submitted over here: https://lore.kernel.org/git/pull.1276.git.1656652799863.gitgitgadget@gmail.com/