From: Jay Soffian <jaysoffian@gmail.com>
Date: Fri, 20 May 2011 12:29:13 GMT
Subject: Re: [BUG] merge-recursive triggered "BUG"
Message-ID: <BANLkTinqWzD=HXWArAOqvuAvzgOpynXPHg@mail.gmail.com>
In-Reply-To: <7v1uzu5a70.fsf@alter.siamese.dyndns.org>

On Thu, May 19, 2011 at 11:21 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> 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?

Okay, I didn't see the band-aid, but I didn't look very hard.

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

I went to confirm the cause, did a merge with v1.7.4-rc0~102
(106e3afa6f) and did not see the "addinfo_cache failed" message. But
now here's the strange part, I then switched back to master
(11bc3e92bf), tried the merge again, and I'm still not seeing the
"addinfo_cache failed" message.

So now I'm trying to figure out what v1.7.4-rc0~102 altered about the
state of my repo that I'm no longer seeing the message.

Hmfph.

j.