From: Stephen Bash <bash@genarts.com>
Date: Wed, 28 Sep 2011 15:44:34 GMT
Subject: Re: error: addinfo_cache failed during merge
Message-ID: <8747507.33675.1317224674110.JavaMail.root@mail.hq.genarts.com>
In-Reply-To: <7vehz01yhx.fsf@alter.siamese.dyndns.org>

----- Original Message -----
> From: "Junio C Hamano" <gitster@pobox.com>
> To: "Stephen Bash" <bash@genarts.com>
> Cc: "git discussion list" <git@vger.kernel.org>
> Sent: Wednesday, September 28, 2011 11:24:10 AM
> Subject: Re: error: addinfo_cache failed during merge
>
> Stephen Bash <bash@genarts.com> 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