git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: "git rebase" behavior change in 2.26.0

From
Elijah Newren <newren@gmail.com>
Date
Mar 27, 2020, 20:59 UTC
Message-ID
<CABPp-BGKeUeMCaOt2b6j1kqgbeTDJxYjRxAPdM+=JB6V1r4EpA@mail.gmail.com>
In-Reply-To
<CABPp-BHihQjMc9qugVtVTZVduRxLYUAhf18R5c=3Lb5bcRzjAw@mail.gmail.com>
On Fri, Mar 27, 2020 at 11:34 AM Elijah Newren <newren@gmail.com> wrote:
>
> On Fri, Mar 27, 2020 at 11:01 AM Norbert Kiesel <nkiesel@gmail.com> wrote:
> >
...
> What's in your .git/config, and in your $HOME/.gitconfig?  (Or maybe
> just the output of 'git config --list'?)
> What hooks do you have setup in .git/hooks/?

After some off-thread discussion due to concerns with sharing his configuration globally...

Ahah, so I can duplicate when using both pull.rebase=true and rebase.autosquash=true. rebase.autosquash in the rebase code sets allow_preemptive_ff to 0, meaning it disables rebase from fast-forwarding. That would have been fine if we only ran a rebase, but we ran both a merge and a rebase and thus updated ORIG_HEAD *twice*. So, the "extra" bug I found upthread (pull runs both merge and rebase for a fast-forward) isn't an extra bug but is *the* bug in question. It's been with us for a few years as Jeff pointed out, but just was uncovered due to the other recent 2.26 changes. Patch incoming soon.

Previous: Elijah Newren
Message 11 of 11 in “"git rebase" behavior change in 2.26.0”
  1. Norbert KieselMar 25, 2020
  2. Jeff KingMar 25, 2020
  3. Elijah NewrenMar 25, 2020
  4. Norbert KieselMar 26, 2020
  5. Norbert KieselMar 26, 2020
  6. Elijah NewrenMar 26, 2020
  7. Elijah NewrenMar 26, 2020
  8. Jeff KingMar 26, 2020
  9. Norbert KieselMar 27, 2020
  10. Elijah NewrenMar 27, 2020
  11. Elijah NewrenMar 27, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.