Re: [PATCH 2/2] fix cherry-pick/revert status after commit

From: Phillip Wood <phillip.wood123@gmail.com>
Date: Apr 8, 2019, 14:17 UTC
Message-ID: <7f4fe847-8cef-efbf-7b9b-44b2df9fba36@gmail.com>
In-Reply-To: <xmqqv9zyxgwk.fsf@gitster-ct.c.googlers.com>

On 01/04/2019 09:34, Junio C Hamano wrote:

Show 11 quoted lines

> Phillip Wood <phillip.wood123@gmail.com> writes:
> 
>> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>>
>> If the user commits a conflict resolution using 'git commit' during a
>> sequence of picks then 'git status' missed the fact that a
>> cherry-pick/revert is still in progress.
> 
> How well would this play with the previous step?  Didn't the change
> to builtin/commit.c made in [1/2] mean that after 'git commit' that
> concludes the last step, there is nothing 'git status' to notice?

You're right about the final pick in a sequence but the idea here is that if the user runs 'git commit' in the middle of a sequence of cherry-picks then we want 'git status' to report that a cherry-pick is in progress.

Best Wishes

Phillip