Ævar Arnfjörð Bjarmason wrote:
> On Thu, Jul 15 2021, Elijah Newren via GitGitGadget wrote:
> > int cmd_pull(int argc, const char **argv, const char *prefix)
> > @@ -1074,9 +1074,8 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
> > if (opt_ff) {
> > if (!strcmp(opt_ff, "--ff-only"))
> > die_ff_impossible();
> > - } else {
> > - if (rebase_unspecified && opt_verbosity >= 0)
> > - show_advice_pull_non_ff();
> > + } else if (rebase_unspecified) {
> > + die_pull_non_ff();
> > }
>
> Here we should:
>
> show_advice_pull_non_ff();
> die(_("some much briefer summary"))
>
> I.e. we should not being showing giantic advice-y die() messages, the
> die messages should always be brief, but we might also show advice just
> before dying.
Indeed, just like my proposal does:
diverging_advice();
die(_("The pull was not fast-forward, either merge or rebase.\n"));
--
Felipe Contreras
