In git.git's "next" branch, unpack_trees() must specify source and target index. Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx> --- 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
