octopus: reenable fast-forward merges
authorStephen Boyd <bebarino@gmail.com>
Sat, 12 Dec 2009 00:38:58 +0000 (16:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Dec 2009 07:40:24 +0000 (23:40 -0800)
The fast-forward logic is never being triggered because $common and
$MRC are never equivalent. $common is initialized to a commit id by
merge-base and MRC is initialized to HEAD. Fix this by initializing
$MRC to the commit id for HEAD so that its possible for $MRC and
$common to be equal.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found