Junio C Hamano wrote:
> Felipe Contreras <felipe.contreras@xxxxxxxxx> writes:
> > Junio C Hamano wrote:
> > 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
