From: Denton Liu <liu.denton@gmail.com>
Date: Tue, 27 Aug 2019 05:38:01 +0000 (-0400)
Subject: rebase: fast-forward --fork-point in more cases
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4effc5bc96ab8cd057e034c11d6f4b93b49cb0a3?hp=4effc5bc96ab8cd057e034c11d6f4b93b49cb0a3

rebase: fast-forward --fork-point in more cases

Before, when we rebased with a --fork-point invocation where the
fork-point wasn't empty, we would be setting options.restrict_revision.
The fast-forward logic would automatically declare that the rebase was
not fast-forwardable if it was set. However, this was painting with a
very broad brush.

Refine the logic so that we can fast-forward in the case where the
restricted revision is equal to the merge base, since we stop rebasing
at the merge base anyway.

Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---