From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Keeping Subject: Re: Segfault in git merge-tree (1.8.2.2) Date: Mon, 6 May 2013 15:49:58 +0100 Message-ID: <20130506144958.GD25912@serenity.lan> References: <20130506133937.GB25912@serenity.lan> <20130506142923.GC25912@serenity.lan> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org To: Andreas Jacobsen X-From: git-owner@vger.kernel.org Mon May 06 16:50:21 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UZMk0-0001Ki-KK for gcvg-git-2@plane.gmane.org; Mon, 06 May 2013 16:50:12 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753731Ab3EFOuF (ORCPT ); Mon, 6 May 2013 10:50:05 -0400 Received: from jackal.aluminati.org ([72.9.247.210]:54223 "EHLO jackal.aluminati.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752120Ab3EFOuE (ORCPT ); Mon, 6 May 2013 10:50:04 -0400 Received: from localhost (localhost [127.0.0.1]) by jackal.aluminati.org (Postfix) with ESMTP id 29494CDA596; Mon, 6 May 2013 15:50:04 +0100 (BST) X-Virus-Scanned: Debian amavisd-new at serval.aluminati.org X-Spam-Flag: NO X-Spam-Score: -12.9 X-Spam-Level: X-Spam-Status: No, score=-12.9 tagged_above=-9999 required=6.31 tests=[ALL_TRUSTED=-1, ALUMINATI_LOCAL_TESTS=-10, BAYES_00=-1.9] autolearn=ham Received: from jackal.aluminati.org ([127.0.0.1]) by localhost (jackal.aluminati.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aPQHG5NeP9nj; Mon, 6 May 2013 15:50:03 +0100 (BST) Received: from serenity.lan (tg1.aluminati.org [10.0.16.53]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by jackal.aluminati.org (Postfix) with ESMTPSA id 02BDCCDA60B; Mon, 6 May 2013 15:50:00 +0100 (BST) Content-Disposition: inline In-Reply-To: <20130506142923.GC25912@serenity.lan> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Mon, May 06, 2013 at 03:29:23PM +0100, John Keeping wrote: > On Mon, May 06, 2013 at 04:13:28PM +0200, Andreas Jacobsen wrote: > > Sure, here you go, this time built from the HEAD I found on github > > (7d3ccdffb5d28970dd7a4d177cfcca690ccd0c22) with: > > > > NO_GETTEXT=1 make prefix=/usr/local/Cellar/git/HEAD CC=cc CFLAGS='-O0 > > -g' install (this is homebrew's setup, but I built it manually rather > > than using the recipe.) > > > > And the gdb output: > > > > (gdb) set args merge-tree 027058e6ac8d03e029c4e1455bf90f63cd20e65b > > FETCH_HEAD master > > (gdb) run > > Starting program: /usr/local/bin/git merge-tree > > 027058e6ac8d03e029c4e1455bf90f63cd20e65b FETCH_HEAD master > > Reading symbols for shared libraries +++++.............................. done > > > > Program received signal EXC_BAD_ACCESS, Could not access memory. > > Reason: KERN_INVALID_ADDRESS at address: 0x0000000000000000 > > 0x000000010006f1a3 in add_merge_entry (entry=0x100432ba0) at > > builtin/merge-tree.c:24 > > 24 *merge_result_end = entry; > > Thanks. I have an idea of what's going on, but the set up is in an > earlier pass and it only fails the next time it gets into > add_merge_entry. > > Can you try adding the following patch on top? Hopefully the added > debug is in the right caller, otherwise the new assert at the top will > point us to the right one. Actually, don't worry about it. I've tracked down the problem and have a failing test case for t4300. Patch to follow shortly.