From: Yuval Kogman <nothingmuch@woobling.org>
Date: Thu, 29 Jan 2009 20:57:43 GMT
Subject: Re: [PATCH] Add --ff-only flag to git-merge
Message-ID: <a891e1bd0901291257t774af061s84497cde8f4bf61c@mail.gmail.com>
In-Reply-To: <7vk58fm8x2.fsf@gitster.siamese.dyndns.org>

Hi,

I started incorperating your feedback but before I send a new patch I
have several questions about the trickier bits:

2009/1/28 Junio C Hamano <gitster@pobox.com>:

>  * The placement of this misses the case where a merge of two unrelated
>   histories is attempted.  You would need to also have a check at "No
>   common ancestors found. We need a real merge." part.

Won't that fall through? The if (!common) is above, and this is
eventually an else if for it (see line 978)

> The octopus
>   codepath could also end up with a fast forward or up-to-date.

So this case is obviously more convoluted... If an octopus merge is
chosen should it just pass --ff-only to git-merge-octopus? Or maybe it
should always pass --ff-only and the various different strategies
would just die unconditionally?