builtin-clone: fix initial checkout

diff --git a/builtin-clone.c b/builtin-clone.c
index a7c075d0e2986cc54355fc44e5cb5459a9351c23..8713128e72da5681104434f944defb7f373db7e8 100644 (file)
--- a/builtin-clone.c
+++ b/builtin-clone.c
@@ -525,7 +525,10 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 
                memset(&opts, 0, sizeof opts);
                opts.update = 1;
+               opts.merge = 1;
+               opts.fn = oneway_merge;
                opts.verbose_update = !option_quiet;
+               opts.src_index = &the_index;
                opts.dst_index = &the_index;
 
                tree = parse_tree_indirect(remote_head->old_sha1);