]> git.ipfire.org Git - thirdparty/git.git/commit - sequencer.c
sequencer: fast-forward `merge` commands, if possible
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Wed, 25 Apr 2018 12:28:56 +0000 (14:28 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 Apr 2018 03:28:42 +0000 (12:28 +0900)
commitd1e8b0114bef98e8efe3f8d35430300ff9e00443
tree9d0b6aff06162167b92a938c8a270d3ae7dd0db8
parent4c68e7ddb59457efe9d3a141dc600feda86cbe67
sequencer: fast-forward `merge` commands, if possible

Just like with regular `pick` commands, if we are trying to rebase a
merge commit, we now test whether the parents of said commit match HEAD
and the commits to be merged, and fast-forward if possible.

This is not only faster, but also avoids unnecessary proliferation of
new objects.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sequencer.c