From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Barkalow Subject: Re: [PATCH] builtin-clone: fix for new unpack_trees() semantics Date: Sun, 9 Mar 2008 19:02:28 -0400 (EDT) Message-ID: References: Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: Junio C Hamano , git@vger.kernel.org To: Johannes Schindelin X-From: git-owner@vger.kernel.org Mon Mar 10 00:03:24 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 1JYUY8-0006Qm-8U for gcvg-git-2@gmane.org; Mon, 10 Mar 2008 00:03:24 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753718AbYCIXCe (ORCPT ); Sun, 9 Mar 2008 19:02:34 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753788AbYCIXCe (ORCPT ); Sun, 9 Mar 2008 19:02:34 -0400 Received: from iabervon.org ([66.92.72.58]:36893 "EHLO iabervon.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753671AbYCIXCd (ORCPT ); Sun, 9 Mar 2008 19:02:33 -0400 Received: (qmail 20481 invoked by uid 1000); 9 Mar 2008 23:02:28 -0000 Received: from localhost (sendmail-bs@127.0.0.1) by localhost with SMTP; 9 Mar 2008 23:02:28 -0000 In-Reply-To: User-Agent: Alpine 1.00 (LNX 882 2007-12-20) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Sun, 9 Mar 2008, Johannes Schindelin wrote: > Hi, > > On Sun, 9 Mar 2008, Daniel Barkalow wrote: > > > On Sun, 9 Mar 2008, Johannes Schindelin wrote: > > > > > In git.git's "next" branch, unpack_trees() must specify source and target > > > index. > > > > > > Signed-off-by: Johannes Schindelin > > > --- > > > > > > To be squashed into 10/11 > > > > > > builtin-clone.c | 2 ++ > > > 1 files changed, 2 insertions(+), 0 deletions(-) > > > > > > diff --git a/builtin-clone.c b/builtin-clone.c > > > index e4047ed..3890e12 100644 > > > --- a/builtin-clone.c > > > +++ b/builtin-clone.c > > > @@ -534,6 +534,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix) > > > opts.verbose_update = !option_quiet; > > > opts.merge = 1; > > > opts.fn = twoway_merge; > > > + opts.src_index = &the_index; > > > + opts.dst_index = &the_index; > > > > Actually, I think the sensible thing is to just not do a merge here, since > > we know there's no index beforehand and the two trees are the same. > > > > I think the odd twoway merge of two copies of HEAD is just an artifact of > > clone originally just doing "git checkout HEAD", and that got translated > > various times failing to notice the special cases. > > Okay, but would oneway_merge not want to write the index, too (rightfully > so)? I'm thinking: memset(&opts, 0, sizeof opts); opts.update = 1; opts.verbose_update = !option_quiet; opts.dst_index = &the_index; init_tree_desc(&t[0], tree->buffer, tree->size); unpack_trees(1, t, &opts); That is, write it, but not read it, and only have one tree. -Daniel *This .sig left intentionally blank*