Re: [BUG] merge-recursive triggered "BUG"

From: Junio C Hamano <gitster@pobox.com>
Date: May 20, 2011, 03:21 UTC
Message-ID: <7v1uzu5a70.fsf@alter.siamese.dyndns.org>
In-Reply-To: <BANLkTimNnRrJ_2UJUSWWd1QS=e0YH2p=_Q@mail.gmail.com>

Jay Soffian <jaysoffian@gmail.com> writes:

Show 11 quoted lines

> On Wed, Mar 16, 2011 at 8:39 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> As a part of my today's merge, I used 'next' that contains b2c8c0a
>> (merge-recursive: When we detect we can skip an update, actually skip it,
>> 2011-02-28) to merge 'maint' into 'master' to propagate older releases up.
>>
>> It triggered a "BUG" per merged path, and I bisected this breakage down to
>> the said commit. Luckily 'master' is not contaminated with the breakage,
>> so I used it to finish today's work.
>
> I just ran into this. It's not in a repo I can share however. But, why
> did b2c8c0a make it into master with this known issue?

Because it was patched by another band-aid, and apparently it was not enough?

You are the second person to report the same regression, so let's revert the merge of the entire topic, ac9666f (Merge branch 'en/merge-recursive', 2011-04-28) from master for now.

Thanks.