builtin-clone: fix initial checkout

Somewhere in the process of finishing up builtin-clone, the update of
the working tree was lost.  This was due to not using the option "merge"
for unpack_trees().

Breakage noticed by Kevin Ballard.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Tested-by: Jeff King <peff@peff.net>
Acked-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

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);

diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
index dc9d63dbf9d21482c881606152f10594f2fe124f..593d1a38772843f1afd67814dcf8920bea3366bc 100755 (executable)
--- a/t/t5601-clone.sh
+++ b/t/t5601-clone.sh
@@ -23,4 +23,11 @@ test_expect_success 'clone with excess parameters' '
 
 '
 
+test_expect_success 'clone checks out files' '
+
+       git clone src dst &&
+       test -f dst/file
+
+'
+
 test_done