Hi Rohit
Congratulations on your first GSoC patch series!
On 08/06/2019 20:19, Rohit Ashiwal wrote:
> In the case of merge conflicts, while performing a revert, we are
> currently advised to use `git cherry-pick --<sequencer-options>`
> of which --continue is incompatible for continuing the revert.
> Introduce a separate advice message for `git revert`.
>
> Signed-off-by: Rohit Ashiwal <rohit.ashiwal265@xxxxxxxxx>
> ---
> sequencer.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/sequencer.c b/sequencer.c
> index f88a97fb10..9c561a041b 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -2655,6 +2655,7 @@ 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)\""));
I agree that it's a good idea to add advice for revert as well, but it
would be better to call sequencer_get_last_command() to find out if
we're running cherry-pick or revert and tailor the advice appropriately.
Best Wishes
Phillip
> return -1;
> } else if (mkdir(git_path_seq_dir(), 0777) < 0)
> return error_errno(_("could not create sequencer directory '%s'"),
>
