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, 15:14 UTC
Message-ID: <60eeff69293fb_10e52087a@natae.notmuch>
In-Reply-To: <CAL3xRKdOyVWvcLXK7zoXtFPiHBjgL24zi5hhg+3yjowwSUPgmg@mail.gmail.com>

Hello,

Son Luong Ngoc wrote:

Show 23 quoted lines

> 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.
> 
>   > git version
>   git version 2.32.0.432.gabb21c7263
>   > git config -l | grep pull
>   pull.rebase=true
>   pull.ff=false
> 
> But a git pull would still run fast-forward.
> Some of our users (including myself) rely on disabling fast-forward to emit the
> per-file change log summary after each git-pull
> 
>   Updating 245f278cb729..5e8d960db7b3
>   Fast-forward
>    some/file/dir.ext         | 44 ++++++++++++++++++++++++++++++++++++++++++++
>    another/file/dir.ext     |  6 +++---
>   2 files changed, 47 insertions(+), 3 deletions(-)
> 
> In a big, fast moving monorepo, this summary is a lot of noise and
> switching to pull.rebase=true
> used to be the way to turn it off.

This is probably due to 340062243a (pull: cleanup autostash check, 2021-06-17).

I bet you have `rebase.autostash=true` configured as well.

It seems to me you were relying on a bug.

> If the change is intended for next
> version release, is there a
> workaround for this?

git pull -n ?

-- 
Felipe Contreras