From: Stephen Boyd <bebarino@gmail.com>
Date: Sat, 12 Dec 2009 00:38:58 +0000 (-0800)
Subject: octopus: reenable fast-forward merges
X-Git-Tag: v1.6.6.1~2^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/85bf49f9a55fd9ded396460d245a55b651d7bdaa?hp=85bf49f9a55fd9ded396460d245a55b651d7bdaa

octopus: reenable fast-forward merges

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>
---