Re: git cherry-pick conflict error message is deceptive when cherry-picking multiple commits

From: Remi Galan Alfonso <remi.galan-alfonso@ensimag.grenoble-inp.fr>
Date: Aug 16, 2016, 08:44 UTC
Message-ID: <968827697.1226723.1471337060482.JavaMail.zimbra@ensimag.grenoble-inp.fr>
In-Reply-To: <09d485df-7d14-97f8-9db9-e3db7512bd68@nokia.com>

Hi Stephen,

Stephen Morton <stephen.morton@nokia.com> writes:

Show 14 quoted lines

> +                        if  (multiple_commits)
> +                               advise(_("after resolving the conflicts,
> mark the corrected paths with 'git add <paths>' or 'git rm <paths>'\n"
> +                                        "then continue with 'git %s
> --continue'\n"
> +                                        "or cancel with 'git %s
> --abort'" ), action_name(opts), action_name(opts));
> +                        else
> +                                advise(_("after resolving the
> conflicts, mark the corrected paths\n"
> +                                        "with 'git add <paths>' or 'git
> rm <paths>'\n"
> +                                        "and commit the result with
> 'git commit'"));

In both cases (multiple_commits or not), the beginning of the advise is nearly the same, with only a '\n' in the middle being the difference:

multiple_commits:
 "after resolving the conflicts, mark the corrected paths with 'git
 add <paths>' or 'git rm <paths>'\n"

!multiple_commits:
 "after resolving the conflicts, mark the corrected paths\n with 'git
 add <paths>' or 'git rm <paths>'\n"
                                                  ~~~~~~~^

In 'multiple_commits' case the advise is more than 80 characters long, did you forget the '\n' in that case?

If you end up using the same beginning of advice, maybe it's possible to give it before the 'if(multiple_commits)' and avoid duplication of the lines.

Thanks, Rémi