Re: [PATCH v3 3/5] t3903: test stash --index merges
Hi Ben
On 28/09/2026 16:55, D. Ben Knoble wrote:
Show 9 quoted lines
> On Mon, Sep 28, 2026 at 11:44 AM Phillip Wood <phillip.wood123@gmail.com> wrote:
>>
>> 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.
It fails because it tries to apply a patch that looks like
@@ -1,3 +1,3 @@
A
B
-C
+staged
to a file that looks like
committed
B
C
and so the first context line does not match. Because the changes do not
overlap the merge machinery is perfectly happy. As an aside when we
clear the worktree changes from "git stash push -p" generate the patch
with "-U1" to try and avoid problems like this.
Thanks
Phillip
>
>> 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.