Re: [PATCH v7 5/5] pull: display default warning only when non-ff

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Dec 15, 2020, 02:57 UTC
Message-ID: <5fd8260432a08_d7c482083c@natae.notmuch>
In-Reply-To: <xmqqmtyg9dq0.fsf@gitster.c.googlers.com>

Junio C Hamano wrote:

> Felipe Contreras <felipe.contreras@gmail.com> writes:
> > Junio C Hamano wrote:

Show 13 quoted lines

> > I strongly predict the conditionals will end up looking similar to:
> >
> >   if (!can_ff) {
> >           if (rebase_unspecified && !opt_ff && opt_verbosity >= 0)
> >                   show_advice_pull_non_ff();
> >   }
> >
> > But OK.
> 
> I may have failed to mention this in the cover letter, but I think
> the placement of opt_ff in this part of the logic needs to be
> rethought, so I strongly predict that this part will have to further
> change ;-)

And precisely because I predicted the same is that I deliberately chose not to preemptively organize the conditionals in any particular way.

Cheers.

-- 
Felipe Contreras