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

From: Junio C Hamano <gitster@pobox.com>
Date: Dec 14, 2020, 23:19 UTC
Message-ID: <xmqqr1ns9drv.fsf@gitster.c.googlers.com>
In-Reply-To: <5fd7d67c898e4_d44af20879@natae.notmuch>

Felipe Contreras <felipe.contreras@gmail.com> writes:

Show 9 quoted lines

> 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. Between a fixed message[] variable and a single-purpose helper function I have no real preference. With either, we can reword the message easily without disrupting any improvements to the codeflow. At least the first sentence in the existing message needs to be separated out of the advice and turned into a separate error or a warning.