From: D. Ben Knoble <ben.knoble@gmail.com>
Date: Fri, 25 Sep 2026 16:16:17 GMT
Subject: Re: [PATCH v2 4/4] builtin/stash: merge index in-core
Message-ID: <CALnO6CB1ptzX1QC=ou4V+tRp9RKHSCKoyh5KqXdBCjGuhKxnnQ@mail.gmail.com>
In-Reply-To: <36e1073e-fa55-4d7d-8b8b-ba9ac34976fa@gmail.com>

On Fri, Sep 25, 2026 at 11:58 AM Phillip Wood <phillip.wood123@gmail.com> wrote:
> On 25/09/2026 13:55, D. Ben Knoble wrote:
> > On Thu, Sep 24, 2026 at 5:42 AM Phillip Wood <phillip.wood123@gmail.com> wrote:
> >>
> >> Sorry, I missed this last time, but we should finalize the merge before
> >> returning to ensure the allocations in result are freed.
> >
> > Yeah, I think CI caught this:
> > https://github.com/benknoble/git/actions/runs/36033463504/job/107747745741#step:5:31
> >
> > But I'm not sure I could have understood what it was telling me
> > without your hint, thanks!
>
> Yes, that output is terrible - to see the leaks you have to scroll to
> line 28282 of "print test failures" which is ridiculous. See
> https://github.com/benknoble/git/actions/runs/36033463504/job/107747745741#step:10:28282

Ah, sorry. My link was sloppy.

I did get that far, but the allocation backtrace doesn't make it
obvious that merge_result is what leaked, and that's where I was
saying an especial thank you ;)

-- 
D. Ben Knoble