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

From: Vegard Nossum <vegard.nossum@oracle.com>
Date: Feb 8, 2024, 08:48 UTC
Message-ID: <ae8d96b7-93b0-4460-b7ed-ffebaddd6f97@oracle.com>
In-Reply-To: <xmqq8r3wcjq2.fsf@gitster.g>

On 07/02/2024 17:39, Junio C Hamano wrote:

Show 16 quoted lines

> Phillip Wood <phillip.wood123@gmail.com> writes:
> 
>> On 06/02/2024 03:54, Junio C Hamano wrote:
>>> Vegard Nossum <vegard.nossum@oracle.com> writes:
>>>
>>>> On 06/02/2024 00:09, Junio C Hamano wrote:
>>> Perhaps it is a good idea to squash them together as a single bugfix
>>> patch?
>>
>> I think so, I'm not sure we want to add a new test file just for this
>> either. Having the test in a separate file was handy for debugging but
>> I think something like the diff below would suffice though I wouldn't
>> object to checking the author of the cherry-picked commit
> 
> Very true (I didn't even notice that the original "bug report
> disguised as a test addition" was inventing a totally new file).

I'm sorry, but I'm confused about what I'm supposed to do now.

There is now another test case and it sounds like you would prefer that one over mine, but I didn't write it and there is no SOB, so I cannot submit that with the fix if I were to "squash them together".

I am not a regular contributor so I don't have a good grasp on things like why you don't want a new test file for this, or why you (as the maintainer) can't just squash the patches yourself if that's what you prefer.

Thanks,

Vegard