Phillip Wood <phillip.wood123@xxxxxxxxx> writes:
> Thanks for fixing this, it needs to clean up MERGE_MSG as well though
>
> Best Wishes
>
> Phillip
>
>> Signed-off-by: Elijah Newren <newren@xxxxxxxxx>
>> ---
>> sequencer.c | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/sequencer.c b/sequencer.c
>> index 7477b15422a..8b4e0200c5f 100644
>> --- a/sequencer.c
>> +++ b/sequencer.c
>> @@ -1957,6 +1957,7 @@ static int do_pick_commit(struct repository *r,
>> flags |= ALLOW_EMPTY;
>> } else if (allow == 2) {
>> drop_commit = 1;
>> + unlink(git_path_cherry_pick_head(r));
When this fails for whatever reason, do we need to do something
special? The same question for MERGE_MSG Phillip mentioned.
Thanks, both.
>> fprintf(stderr,
>> _("dropping %s %s -- patch contents already upstream\n"),
>> oid_to_hex(&commit->object.oid), msg.subject);
>>
