Re: [PATCH] pull: abort if --ff-only is given and fast-forwarding is impossible

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Jul 14, 2021, 17:31 UTC
Message-ID: <60ef1f6a83b61_9460a208cc@natae.notmuch>
In-Reply-To: <CABPp-BEqnTuDgC0Bb+feFj=vBB48wdb60thO+Pq3N0jL74jH8Q@mail.gmail.com>

Elijah Newren wrote:

Show 8 quoted lines

> On Wed, Jul 14, 2021 at 1:37 AM Son Luong Ngoc <sluongng@gmail.com> wrote:
> > I am out of the loop in this thread but I have been seeing strange behaviors
> > with pull.rebase=true in the 'next' branch and also in the 'master'
> > branch in recent days.
> 
> I'm not surprised it happens with recent versions, but I'd expect this
> to have happened with older versions too.  Is this not reproducible
> with git-2.32.0 or older git versions?

I already provided an accurate target [1].

Show 11 quoted lines

> >   > git version
> >   git version 2.32.0.432.gabb21c7263
> >   > git config -l | grep pull
> >   pull.rebase=true
> >   pull.ff=false
> 
> So, you have conflicting configuration options set.  pull.ff=false
> maps to --no-ff which is documented to create a merge.
> pull.rebase=true maps to --rebase which says to run a rebase.
> 
> You probably want to drop one of these.

`pull.ff` will be honored by `git pull --merge`.

[1] https://lore.kernel.org/git/60eeff69293fb_10e52087a@natae.notmuch/

-- 
Felipe Contreras