Git development
 help / color / mirror / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Daniel Barkalow <barkalow@iabervon.org>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: [PATCH] builtin-clone: fix for new unpack_trees() semantics
Date: Sun, 9 Mar 2008 22:30:35 +0100 (CET)	[thread overview]
Message-ID: <alpine.LSU.1.00.0803092227230.3975@racer.site> (raw)
In-Reply-To: <alpine.LNX.1.00.0803081803360.19665@iabervon.org>

In git.git's "next" branch, unpack_trees() must specify source and target 
index.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---

	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;
 
 		tree = parse_tree_indirect(remote_head->old_sha1);
 		parse_tree(tree);
-- 
1.5.4.3.653.gbc310

  reply	other threads:[~2008-03-09 21:31 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-08 23:04 [PATCH 10/11] Build in clone Daniel Barkalow
2008-03-09 21:30 ` Johannes Schindelin [this message]
2008-03-09 22:35   ` [PATCH] builtin-clone: fix for new unpack_trees() semantics Daniel Barkalow
2008-03-09 22:55     ` Johannes Schindelin
2008-03-09 23:02       ` Daniel Barkalow
2008-03-09 23:05         ` Johannes Schindelin
2008-03-09 23:14           ` Daniel Barkalow
2008-03-10 10:58             ` Johannes Schindelin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=alpine.LSU.1.00.0803092227230.3975@racer.site \
    --to=johannes.schindelin@gmx.de \
    --cc=barkalow@iabervon.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox