From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Bash Subject: Re: error: addinfo_cache failed during merge Date: Wed, 28 Sep 2011 11:44:34 -0400 (EDT) Message-ID: <8747507.33675.1317224674110.JavaMail.root@mail.hq.genarts.com> References: <7vehz01yhx.fsf@alter.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: git discussion list To: Junio C Hamano X-From: git-owner@vger.kernel.org Wed Sep 28 17:44:52 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 1R8wJX-0006AR-6V for gcvg-git-2@lo.gmane.org; Wed, 28 Sep 2011 17:44:51 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754923Ab1I1Poq (ORCPT ); Wed, 28 Sep 2011 11:44:46 -0400 Received: from hq.genarts.com ([173.9.65.1]:7926 "HELO mail.hq.genarts.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1753270Ab1I1Poq (ORCPT ); Wed, 28 Sep 2011 11:44:46 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.hq.genarts.com (Postfix) with ESMTP id 6F07DEA23C2; Wed, 28 Sep 2011 11:44:41 -0400 (EDT) X-Virus-Scanned: amavisd-new at mail.hq.genarts.com Received: from mail.hq.genarts.com ([127.0.0.1]) by localhost (mail.hq.genarts.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Oy6FqXU4K6QJ; Wed, 28 Sep 2011 11:44:34 -0400 (EDT) Received: from mail.hq.genarts.com (mail.hq.genarts.com [10.102.202.62]) by mail.hq.genarts.com (Postfix) with ESMTP id 233E7EA22D7; Wed, 28 Sep 2011 11:44:34 -0400 (EDT) In-Reply-To: <7vehz01yhx.fsf@alter.siamese.dyndns.org> X-Mailer: Zimbra 6.0.10_GA_2692 (ZimbraWebClient - SAF3 (Mac)/6.0.10_GA_2692) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: ----- Original Message ----- > From: "Junio C Hamano" > To: "Stephen Bash" > Cc: "git discussion list" > Sent: Wednesday, September 28, 2011 11:24:10 AM > Subject: Re: error: addinfo_cache failed during merge > > Stephen Bash writes: > > > ... I should caveat that my local git/git is a little out of date > > because I haven't repointed it since k.org went down (I use it very > > rarely), so there might be something newer in this area. > > Indeed there have been a few fixs in this area and it would be really > nice if you can test this with the latest master branch before 1.7.7 > final ships. The problem reproduces on master (8d714b1). Git builds really fast when I don't need docs ;) In case it's important, this is all on MacOS 10.6.8. Thanks, Stephen