Re: [PATCH v5] [GSOC] cherry-pick: use better advice message

From: ZheNing Hu <adlternative@gmail.com>
Date: Aug 19, 2021, 02:07 UTC
Message-ID: <CAOLTT8QuL-yws77-N9j6Qu2r_1ALPiYasj+6EO_J0v0QcmcCmw@mail.gmail.com>
In-Reply-To: <CAOLTT8T0A5_5sSxpJBSLgbbCWW61q6tVSesAAzf5SrhDxf1bcA@mail.gmail.com>

ZheNing Hu <adlternative@gmail.com> 于2021年8月19日周四 上午9:55写道：

Show 15 quoted lines

>
> Phillip Wood <phillip.wood123@gmail.com> 于2021年8月18日周三 下午5:51写道：
> >
> > Thanks for making the revert advice better as well
> >
>
> Thanks for reviewing too.
>
> > >               else
> > >                       advise(_("after resolving the conflicts, mark the corrected paths\n"
> > >                                "with 'git add <paths>' or 'git rm <paths>'\n"
> >
> > I think this last else arm should probably be a bug now as anything
> > other than cherry-pick or revert should be setting GIT_CHERRY_PICK_HELP
> >

GIT_CHERRY_PICK_HELP should be set for other commands except cherry-pick and revert.

Show 7 quoted lines

> >         else
> >                 BUG("unexpected pick action in print_advice()");
> >
>
> Maybe you are right, If no one else will touch it, it may be
> reasonable to set it as BUG().
>

-- ZheNing