Re: [PATCH RFC] rebase: respect --ff-only option

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 5, 2021, 16:50 UTC
Message-ID: <xmqqpmvwn1qp.fsf@gitster.g>
In-Reply-To: <7ee36923-0806-4316-729c-8418df5b6555@gmail.com>

Phillip Wood <phillip.wood123@gmail.com> writes:

> Looking at origin/seen:builtin/pull.c we already check if we can
> fast-forward and unconditionally merge in that case irrespective of
> any '--rebase' option or pull.rebase config. It should be simple for
> pull to error out if '--ff-only' is given and we cannot fast-forward.

Excellent.

Even though teaching even more special case on the "git pull" side makes me feel somewhat dirty, but I think it would be a small price to pay, and the end result would save an useless fork whose sole purpose is to make the integration step after fetch fail when "pull" can easily tell, as you said, that it ought to fail, so overall it would probably be a net win.

Thanks.