From: Jeff King <peff@peff.net>
To: Dmitry Marakasov <amdmi3@amdmi3.ru>
Cc: git@vger.kernel.org
Subject: Re: pull.rebase config option broken in 2.33.1
Date: Tue, 2 Nov 2021 10:20:00 -0400 [thread overview]
Message-ID: <YYFJEASSimMhEsYz@coredump.intra.peff.net> (raw)
In-Reply-To: <YYFEE/2g3SiM04zx@hades.panopticon>
On Tue, Nov 02, 2021 at 04:58:43PM +0300, Dmitry Marakasov wrote:
> 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
next prev parent reply other threads:[~2021-11-02 14:20 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-02 13:58 pull.rebase config option broken in 2.33.1 Dmitry Marakasov
2021-11-02 14:20 ` Jeff King [this message]
2021-11-26 18:05 ` Dmitry Marakasov
2021-11-26 21:44 ` Jeff King
2021-11-26 21:45 ` Jeff King
2021-11-26 22:43 ` Elijah Newren
2021-11-27 5:05 ` Jeff King
2021-11-27 5:26 ` Elijah Newren
2021-12-02 15:26 ` Dmitry Marakasov
2021-12-02 16:54 ` Elijah Newren
2021-11-27 5:27 ` Elijah Newren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YYFJEASSimMhEsYz@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=amdmi3@amdmi3.ru \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).