Re: [GSoC][PATCH 3/3] cherry-pick/revert: update hints

From: Phillip Wood <phillip.wood123@gmail.com>
To: Rohit Ashiwal <rohit.ashiwal265@gmail.com>, git@vger.kernel.org
Cc: newren@gmail.com, t.gummerer@gmail.com
Subject: Re: [GSoC][PATCH 3/3] cherry-pick/revert: update hints
Date: Sun, 9 Jun 2019 19:03:02 +0100	[thread overview]
Message-ID: <61a8bfde-018c-5a69-5abd-89d4a332e39e@gmail.com> (raw)
In-Reply-To: <20190608191958.4593-4-rohit.ashiwal265@gmail.com>

Hi Rohit

On 08/06/2019 20:19, Rohit Ashiwal wrote:
> Signed-off-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
> ---
>  builtin/commit.c | 13 ++++++++-----
>  sequencer.c      |  4 ++--
>  2 files changed, 10 insertions(+), 7 deletions(-)
> 
> diff --git a/builtin/commit.c b/builtin/commit.c
> index 1c9e8e2228..1f47c51bdc 100644
> --- a/builtin/commit.c
> +++ b/builtin/commit.c
> @@ -60,15 +60,18 @@ N_("The previous cherry-pick is now empty, possibly due to conflict resolution.\
>  "\n");
>  
>  static const char empty_cherry_pick_advice_single[] =
> -N_("Otherwise, please use 'git reset'\n");
> +N_("Otherwise, please use 'git cherry-pick --skip'\n");
>  
>  static const char empty_cherry_pick_advice_multi[] =
> -N_("If you wish to skip this commit, use:\n"
> +N_("and then use:\n"
>  "\n"
> -"    git reset\n"
> +"    git cherry-pick --continue\n"
>  "\n"
> -"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
> -"the remaining commits.\n");
> +"to resume cherry-picking the remaining commits.\n"
> +"If you wish to skip this commit, use:\n"
> +"\n"
> +"    git cherry-pick --skip\n"
> +"\n");
>  
>  static const char *color_status_slots[] = {
>  	[WT_STATUS_HEADER]	  = "header",
> diff --git a/sequencer.c b/sequencer.c
> index f586e677d3..e889427eef 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -2654,8 +2654,8 @@ static int create_seq_dir(void)
>  {
>  	if (file_exists(git_path_seq_dir())) {
>  		error(_("a cherry-pick or revert is already in progress"));
> -		advise(_("try \"git cherry-pick (--continue | --quit | --abort)\""));
> -		advise(_("or  \"git revert (--continue | --quit | --abort)\""));
> +		advise(_("try \"git cherry-pick (--continue | --skip | --quit | --abort)\""));
> +		advise(_("or  \"git revert (--continue | --skip | --quit | --abort)\""));

If the user has already committed the conflict resolution then we don't
want to recommend --skip as there is nothing to skip.

Best Wishes

Phillip

>  		return -1;
>  	} else if (mkdir(git_path_seq_dir(), 0777) < 0)
>  		return error_errno(_("could not create sequencer directory '%s'"),
> 