Re: [PATCH 2/2] sequencer: unset GIT_CHERRY_PICK_HELP for 'exec' commands

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 6, 2024, 03:54 UTC
Message-ID: <xmqqcytal01i.fsf@gitster.g>
In-Reply-To: <b3ec5d0b-ac17-4d1e-a17d-d5adfbfc6ccf@oracle.com>

Vegard Nossum <vegard.nossum@oracle.com> writes:

Show 19 quoted lines

> On 06/02/2024 00:09, Junio C Hamano wrote:
>> "Kristoffer Haugsbakk" <code@khaugsbakk.name> writes:
>> 
>>> On Mon, Feb 5, 2024, at 15:13, Vegard Nossum wrote:
>>>> Link: https://lore.kernel.org/git/0adb1068-ef10-44ed-ad1d-e0927a09245d@gmail.com/
>>>> Suggested-by: Phillip Wood <phillip.wood123@gmail.com>
>>>> Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com>
>>>
>>> `Link` is not really used a lot. Junio’s `refs/notes/amlog` will point
>>> back to the patch (which is often close to the “suggested by” and so
>>> on).
>> Good.  Also, is there [PATCH 1/2] that comes before this patch?
>
> Yes, kind of -- that's the testcase at the root of the thread:
>
> https://lore.kernel.org/git/20240202091850.160203-1-vegard.nossum@oracle.com/
>
> ("t/t3515-cherry-pick-rebase.sh: new testcase demonstrating broken
> behavior")

If the first one was NOT marked as [1/2], it is customary to call such an "we thought just one patch was sufficient, but here is another" step [2/1] instead, and that was why I was confused.

Perhaps it is a good idea to squash them together as a single bugfix patch?

Thanks.