Re: [PATCH v7 4/5] pull: correct condition to trigger non-ff advice

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Dec 15, 2020, 06:35 UTC
Message-ID: <5fd859149990b_d7c48208d8@natae.notmuch>
In-Reply-To: <xmqqr1ns9drv.fsf@gitster.c.googlers.com>

Junio C Hamano wrote:

Show 15 quoted lines

> Felipe Contreras <felipe.contreras@gmail.com> writes:
> 
> > Then, we could just do:
> >
> >   if (opt_verbosity >= 0)
> >           advise(_(message_advice_pull_non_ff)).
> >
> > Or even better:
> >
> >   if (opt_verbosity >= 0)
> >           advise_if_enabled(ADVICE_PULL_NON_FF, _(message_advice_pull_non_ff));
> 
> I do not think we've decided what's the right way to squelch this
> advice, so it is a bit premature to favor the latter over the
> former.

I agree. Just thinking about the future.

> Between a fixed message[] variable and a single-purpose
> helper function I have no real preference.

OK. I just mentioned for consistencty with other parts of git.

-- 
Felipe Contreras