| commit | 85bf49f9a55fd9ded396460d245a55b651d7bdaa | |
| author | Stephen Boyd <bebarino@gmail.com> | |
| Sat, 12 Dec 2009 00:38:58 +0000 (11 16:38 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 14 Dec 2009 07:40:24 +0000 (13 23:40 -0800) | ||
| tree | f7927bdd30d780307a963ddf63a71f5543ebe09e | treesnapshot (tar.gz zip) |
| parent | 81334502eed1c78f49fc74936b712b3cf32b682a | commitdiff |
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>
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>
| git-merge-octopus.sh | diffblobblamehistory | |
| t/t7602-merge-octopus-many.sh | diffblobblamehistory |