[PATCH] builtin-clone: fix for new unpack_trees() semantics
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Mar 9, 2008, 21:30 UTC
- Message-ID
- <alpine.LSU.1.00.0803092227230.3975@racer.site>
- 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