From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: [PATCH] Fix in-index merge. Date: Sat, 23 Aug 2008 02:55:56 -0700 Message-ID: <7vej4g12dv.fsf@gitster.siamese.dyndns.org> References: <20080823060839.GB23800@genesis.frugalware.org> <1219479293-29111-1-git-send-email-vmiklos@frugalware.org> <48AFD62F.2090500@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Miklos Vajna , Jeff King , git@vger.kernel.org To: Paolo Bonzini X-From: git-owner@vger.kernel.org Sat Aug 23 11:57:15 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1KWpru-0001PR-RC for gcvg-git-2@gmane.org; Sat, 23 Aug 2008 11:57:15 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752498AbYHWJ4K (ORCPT ); Sat, 23 Aug 2008 05:56:10 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752378AbYHWJ4I (ORCPT ); Sat, 23 Aug 2008 05:56:08 -0400 Received: from a-sasl-quonix.sasl.smtp.pobox.com ([208.72.237.25]:48060 "EHLO sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752328AbYHWJ4H (ORCPT ); Sat, 23 Aug 2008 05:56:07 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by a-sasl-quonix.sasl.smtp.pobox.com (Postfix) with ESMTP id 776666433F; Sat, 23 Aug 2008 05:56:06 -0400 (EDT) Received: from pobox.com (ip68-225-240-211.oc.oc.cox.net [68.225.240.211]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by a-sasl-quonix.sasl.smtp.pobox.com (Postfix) with ESMTPSA id 70E5D6433B; Sat, 23 Aug 2008 05:55:59 -0400 (EDT) In-Reply-To: <48AFD62F.2090500@gnu.org> (Paolo Bonzini's message of "Sat, 23 Aug 2008 11:19:43 +0200") User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux) X-Pobox-Relay-ID: B4485F8C-70F9-11DD-824F-3113EBD4C077-77302942!a-sasl-quonix.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Here is a tentative fix on top of Miklos's two patches, even though I won't take them as-is until the test scripts are cleaned up. t/t7605-merge-resolve.sh | 4 +++- unpack-trees.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git c/t/t7605-merge-resolve.sh w/t/t7605-merge-resolve.sh index ee21a10..be21ded 100755 --- c/t/t7605-merge-resolve.sh +++ w/t/t7605-merge-resolve.sh @@ -36,7 +36,9 @@ test_expect_success 'merge c1 to c2' ' git diff --exit-code && test -f c0.c && test -f c1.c && - test -f c2.c + test -f c2.c && + test 3 = $(git ls-tree -r HEAD | wc -l) && + test 2 = $(git ls-files | wc -l) ' test_expect_success 'merge c2 to c3 (fails)' ' diff --git c/unpack-trees.c w/unpack-trees.c index cba0aca..016fd46 100644 --- c/unpack-trees.c +++ w/unpack-trees.c @@ -378,6 +378,8 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options memset(&o->result, 0, sizeof(o->result)); if (o->src_index) o->result.timestamp = o->src_index->timestamp; + if (o->dst_index) + o->result.alloc = xmalloc(1); o->merge_size = len; if (!dfc)