git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jay Soffian <jaysoffian@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Ciaran <ciaranj@gmail.com>, Elijah Newren <newren@gmail.com>,
	git@vger.kernel.org
Subject: Re: [BUG] merge-recursive triggered "BUG"
Date: Fri, 20 May 2011 08:29:13 -0400	[thread overview]
Message-ID: <BANLkTinqWzD=HXWArAOqvuAvzgOpynXPHg@mail.gmail.com> (raw)
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.

  reply	other threads:[~2011-05-20 12:29 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-17  0:39 [BUG] merge-recursive triggered "BUG" Junio C Hamano
2011-03-17 21:45 ` Junio C Hamano
2011-03-18  6:07   ` [PATCH] merge-recursive: tweak magic band-aid Junio C Hamano
2011-03-21 18:24     ` Elijah Newren
2011-05-20  1:14 ` [BUG] merge-recursive triggered "BUG" Jay Soffian
2011-05-20  1:17   ` Jay Soffian
2011-05-20  3:21   ` Junio C Hamano
2011-05-20 12:29     ` Jay Soffian [this message]
2011-05-20 13:00       ` Jay Soffian

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='BANLkTinqWzD=HXWArAOqvuAvzgOpynXPHg@mail.gmail.com' \
    --to=jaysoffian@gmail.com \
    --cc=ciaranj@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=newren@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).