On Fri, Mar 27, 2020 at 11:34 AM Elijah Newren <newren@xxxxxxxxx> wrote: > > On Fri, Mar 27, 2020 at 11:01 AM Norbert Kiesel <nkiesel@xxxxxxxxx> 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.
