From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jay Soffian Subject: Re: [BUG] merge-recursive triggered "BUG" Date: Fri, 20 May 2011 09:00:41 -0400 Message-ID: References: <7v4o7260no.fsf@alter.siamese.dyndns.org> <7v1uzu5a70.fsf@alter.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Cc: Ciaran , Elijah Newren , git@vger.kernel.org To: Junio C Hamano X-From: git-owner@vger.kernel.org Fri May 20 15:00:49 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QNPJw-0006Cy-FG for gcvg-git-2@lo.gmane.org; Fri, 20 May 2011 15:00:48 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932723Ab1ETNAn (ORCPT ); Fri, 20 May 2011 09:00:43 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:50915 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932678Ab1ETNAm (ORCPT ); Fri, 20 May 2011 09:00:42 -0400 Received: by pvg12 with SMTP id 12so1654868pvg.19 for ; Fri, 20 May 2011 06:00:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=ZzXbzJbLH/aVxlOpyCf50ZaUEncu8wENaZ57SfY2QQM=; b=OrE7OCRd86YlS/nKoETUZ6DqMC6FA/Of5f0E8b/6yQ9p9zlz7SVLTFb1nxIPwJ9clf aucV94ZjAx5JCFyKxDSG6esIix5ZcgA57Yod1w5IMbEuFq8aJVX22E8oR5DtYl+L54H+ +dj3dbOYKMlW/wby+LDF1CAFc3dML89A5roNA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=kYB67OV6oKn5Im/l7tIrl4r4K17kYaASXLQZneh8Ax4vwzQPABs0H7TiCNG+i0npxD NuA07PN4L5drfyVzHaxQwvXTgmQzhBFlusLOFDAIMca2tKqh552v3DdT6Hn3xh7HBJQq DDO2u9kjIz5v+vQJpGGWfZR3uhqZ339plUR48= Received: by 10.142.225.6 with SMTP id x6mr2625944wfg.55.1305896441723; Fri, 20 May 2011 06:00:41 -0700 (PDT) Received: by 10.142.13.8 with HTTP; Fri, 20 May 2011 06:00:41 -0700 (PDT) In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Fri, May 20, 2011 at 8:29 AM, Jay Soffian wrote: > On Thu, May 19, 2011 at 11:21 PM, Junio C Hamano 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. Sorry, it's definitely that topic. I didn't realize you'd already reverted it from master. The bug occurs between when the topic was merged and when it was reverted. Thanks, j.