Re: [PATCH 1/2] replay: fail gracefully when a merge input is unreadable

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 21, 2026, 03:37 UTC
Message-ID: <xmqqh5korvog.fsf@gitster.g>
In-Reply-To: <CABPp-BGFpLi+FEoJOXvT=wBtexXiDmJ9vXQfc5JnBDrUk+zbDA@mail.gmail.com>

Elijah Newren <newren@gmail.com> writes:

Show 16 quoted lines

>> > +             # Ensure replay gracefully handles the missing object
>> > +             test_must_fail git replay --onto onto base..side 2>err &&
>> > +             test_grep ! "[Ss]egmentation" err &&
>> > +             test_grep "Could not read\|collecting merge info failed" err
>>
>> "test_must_fail" means "the tested command must fail voluntarily and
>> in a controlled way", so a segfaulting git-replay invocation would
>> not pass test_must_fail.  Hence, there is no need to separately
>> test "test_grep ! '[sS]egmentation'".
>
> Oops, you're right.
>
> You said on 2/2 that I don't need to rebase because you're putting
> together an evil merge.  Do you want me to resubmit with this line
> removed (without changing the series' base), or would you rather I
> avoid that to prevent merging work for you?

I can remove that line myself, or you can resubmit on the same base. The evil-merge machinery uses the usual 3-way merge, so I do not think removal of that "test_grep !" line would break it either way.

Thanks.