jc/fix-pull-ff-only-when-already-up-to-date, was Re: What's cooking in git.git (Nov 2021, #03; Tue, 9)

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Nov 10, 2021, 13:04 UTC
Message-ID: <nycvar.QRO.7.76.6.2111101402240.21127@tvgsbejvaqbjf.bet>
In-Reply-To: <xmqqy25wygek.fsf@gitster.g>

Hi Junio,

On Tue, 9 Nov 2021, Junio C Hamano wrote:

Show 11 quoted lines

> * jc/fix-pull-ff-only-when-already-up-to-date (2021-10-29) 1 commit
>   (merged to 'next' on 2021-10-29 at ad4753e668)
>  + pull: --ff-only should make it a noop when already-up-to-date
>
>  "git pull --ff-only" and "git pull --rebase --ff-only" should make
>  it a no-op to attempt pulling from a remote that is behind us, but
>  instead the command errored out by saying it was impossible to
>  fast-forward, which may technically be true, but not a useful thing
>  to diagnose as an error.  This has been corrected.
>
>  Will cook in 'next'.

I would like to register a vote for advancing this into v2.34.0, still. It is not only technically a regression, it bit me in Git for Windows' automation. If my experience is any indication, that change of behavior would not be welcome among Git users, and it would be preferable to publish v2.34.0 without this regression.

Ciao, Dscho