Re: What's cooking in git.git (Nov 2026, #02)

[Tyler Cipriani <tyler@tylercipriani.com>]

On 26-11-04 17:29:11, Junio C Hamano wrote:
>* tc/push-force-if-includes-fixes (2026-10-18) 3 commits
> - push: --force-if-includes should allow fast-forward
> - push: fix --force-if-includes non-branch advice
> - push: check pushed ref for --force-if-includes
>
> The '--force-if-includes' protection for 'git push' has been updated
> to consult the reflog of the local branch being pushed, rather than
> incorrectly checking the reflog of a local branch that shares the name
> of the remote destination branch.  The push advice for detached HEAD
> scenarios has also been adjusted to indicate that the remote ref
> cannot be verified locally.  A regression that caused perfectly valid
> fast-forward pushes to be rejected when reflogs were expired has been
> fixed.
>
> Needs review.
> source: <20261018203255.2343005-1-tyler@tylercipriani.com>

One note nit here: --force-if-includes rejecting fast-forward is not a
regression. It's been a bug since the flag was introduced in 3b990aa645
(push: parse and set flag for "--force-if-includes", 2020-10-03).

That is, this has always been rejected:

    git init --bare r.git && git clone r.git wt && cd wt
    git commit --allow-empty -m A
    git push origin main
    git commit --allow-empty -m B
    git reflog expire --expire=all main
    git push --force-with-lease --force-if-includes origin main