summaryrefslogtreecommitdiff
path: root/builtin/worktree.c
diff options
context:
space:
mode:
authorLibravatar Denton Liu <liu.denton@gmail.com>2019-08-27 01:38:01 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-08-27 15:33:40 -0700
commit4effc5bc96ab8cd057e034c11d6f4b93b49cb0a3 (patch)
treef932e06b1601897a6b38ac3a522855d3e1ef22fd /builtin/worktree.c
parentrebase: fast-forward --onto in more cases (diff)
downloadtgif-4effc5bc96ab8cd057e034c11d6f4b93b49cb0a3.tar.xz
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>
Diffstat (limited to 'builtin/worktree.c')
0 files changed, 0 insertions, 0 deletions