Re: What's cooking in git.git (Sep 2019, #01; Sat, 7)

From: Denton Liu <liu.denton@gmail.com>
Date: Sep 10, 2019, 00:18 UTC
Message-ID: <20190910001858.GA63889@dentonliu-ltm.internal.salesforce.com>
In-Reply-To: <xmqqo8zti6oy.fsf@gitster-ct.c.googlers.com>

On Mon, Sep 09, 2019 at 12:57:17PM -0700, Junio C Hamano wrote:

Show 21 quoted lines

> Denton Liu <liu.denton@gmail.com> writes:
> 
> > Hi Junio,
> >
> > On Sat, Sep 07, 2019 at 10:26:53AM -0700, Junio C Hamano wrote:
> >> * dl/complete-cherry-pick-revert-skip (2019-08-27) 3 commits
> >>  - status: mention --skip for revert and cherry-pick
> >>  - completion: add --skip for cherry-pick and revert
> >>  - completion: merge options for cherry-pick and revert
> >> 
> >>  The command line completion support (in contrib/) learned about the
> >>  "--skip" option of "git revert" and "git cherry-pick".
> >> 
> >>  Will merge to 'next'.
> >
> > Did we end up deciding whether or not we were going to drop "status:
> > mention --skip for revert and cherry-pick"?
> 
> If you are not convinced it is a good idea, we can easily drop it
> (and I do not mind dropping it---I am not convinced it is a good
> idea myself).

In that case, let's not drop it. The original impetus for this idea came from cherry-picking a range of commits where one of the commits in the range patched a file that didn't exist on the target branch, so in this case skipping was the right course of action.

In any case, I believe that giving the user more information in this case is, at worst, neutral.