Re: [PATCH] commit: correct advice about aborting a cherry-pick

From: Jeff King <peff@peff.net>
Date: Jul 26, 2013, 23:19 UTC
Message-ID: <20130726231902.GA1674@sigill.intra.peff.net>
In-Reply-To: <20130726230857.GK14690@google.com>

On Fri, Jul 26, 2013 at 04:08:57PM -0700, Jonathan Nieder wrote:

Show 27 quoted lines

> Jeff King wrote:
> 
> > --- a/builtin/commit.c
> > +++ b/builtin/commit.c
> > @@ -63,8 +63,14 @@ N_("The previous cherry-pick is now empty, possibly due to conflict resolution.\
> >  "If you wish to commit it anyway, use:\n"
> >  "\n"
> >  "    git commit --allow-empty\n"
> > +"\n");
> > +static const char empty_cherry_pick_advice_skip_single[] =
> > +N_("Otherwise, please use 'git reset'\n");
> > +static const char empty_cherry_pick_advice_skip_multi[] =
> > +N_("If you wish to skip this commit, use:\n"
> >  "\n"
> > -"Otherwise, please use 'git reset'\n");
> > +"    git reset && git cherry-pick --continue\n"
> > +"\n");
> 
> Hmm, wouldn't it be more consistent to either say
> 
> 	If you wish to commit it anyway, use
> 
> 		git commit --allow-empty && git cherry-pick --continue
> 
> 	If you wish to skip this commit, use
> 
> 		git reset && git cherry-pick --continue

Good point. Clearly the original assumed that you knew to "cherry-pick --continue", since it is needed (and omitted) in both cases. And perhaps most people do, but certainly the lack of mentioning it confused both me and Ram about whether the "git reset" advice was meant to skip or abort.

Show 12 quoted lines

> Or
> 
> 	If you wish to commit it anyway, use
> 
> 		git commit --allow-empty
> 	
> 	If you wish to skip this commit, use
> 
> 		git reset
> 
> 	Then "git cherry-pick --continue" will resume cherry-picking
> 	the remaining commits.

I like this one better.

You could _almost_ just use the top bit for the single-commit case, but I hesitate to use the word "skip" in that case. Right now the single-commit case does not need to make the distinction between "skip this, and there is nothing else to do" and "abort the operation", because they are the same thing. Whichever way the user thinks about it is OK.

-Peff