Re: pull.rebase config option broken in 2.33.1

From: Jeff King <peff@peff.net>
Date: Nov 2, 2021, 14:20 UTC
Message-ID: <YYFJEASSimMhEsYz@coredump.intra.peff.net>
In-Reply-To: <YYFEE/2g3SiM04zx@hades.panopticon>

On Tue, Nov 02, 2021 at 04:58:43PM +0300, Dmitry Marakasov wrote:

Show 22 quoted lines

> After update from 2.33.0 to 2.33.1 the pull.rebase = true option
> no longer works: `git pull` no longer tries to rebase (however manual
> `git pull --rebase` works fine):
> 
> % git config pull.rebase
> true
> % git pull
> fatal: Not possible to fast-forward, aborting.
> % git pull --rebase
> Successfully rebased and updated refs/heads/local-fixes.
> % git pull
> fatal: Not possible to fast-forward, aborting.
> % grep -C1 rebase .git/config
> [pull]
> 	rebase = true
> [rebase]
> 	autostash = true
> 
> After downgrade to 2.33.0:
> 
> % git pull
> Current branch local-fixes is up to date.

This looks like the same bug discussed in:

  https://lore.kernel.org/git/CH2PR06MB650424B4205102AC6A48F489B1BD9@CH2PR06MB6504.namprd06.prod.outlook.com/

There's a fix in that thread. It's currently in "next", but didn't quite make the cutoff for the upcoming v2.34.0.

-Peff