Re: [PATCH v3 3/5] t3903: test stash --index merges

From: D. Ben Knoble <ben.knoble@gmail.com>
Date: Sep 28, 2026, 15:55 UTC
Message-ID: <CALnO6CCX+CvMZcOiyaFB0_nhe0wSv2-E2hx-iTbN4OvSVvNDRw@mail.gmail.com>
In-Reply-To: <97f86d82-b5ec-44df-9ccf-8e6cd93e45f4@gmail.com>

On Mon, Sep 28, 2026 at 11:44 AM Phillip Wood <phillip.wood123@gmail.com> wrote:

Show 11 quoted lines

>
> Hi Ben
>
> On 26/09/2026 13:16, D. Ben Knoble wrote:
> > A future commit will refactor index handling for applied stashes, and we
> > need to take care to get the order of trees right when merging. Add a
> > test that covers this case.
>
> The test looks good, but without the changes in patch 5 it fails and so
> adding it here breaks running "git bisect" on this series. I'd squash
> this into the final patch

Interesting. I thought I checked that the test passed sans patch 5, but I'll double check. I can't think of a reason it wouldn't offhand, but my thoughts on patch 5's changes have become a bit scattered.

> and I think we can probably replace an
> existing "stash apply --index" tests that are not so strict with this
> one, rather than adding a new test.

That's probably a good idea, thanks.