]> git.ipfire.org Git - thirdparty/git.git/commit
pull: refactor fast-forward check
authorFelipe Contreras <felipe.contreras@gmail.com>
Sat, 12 Dec 2020 16:52:06 +0000 (10:52 -0600)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Dec 2020 16:59:40 +0000 (08:59 -0800)
commit77a7ec632952ee335cb544fee7c6b3fb1c5ec147
tree892d736120837a2a5873ab9ce38243166e3f3021
parent3a0b884caba2752da0af626fb2de7d597c844e8b
pull: refactor fast-forward check

We would like to be able to make this check before the decision to
rebase is made in a future step.  Besides, using a separate helper
makes the code easier to follow.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/pull.c