From: Johannes Schindelin Date: Thu, 15 May 2008 09:48:25 +0000 (+0100) Subject: builtin-clone: fix initial checkout X-Git-Tag: v1.5.6-rc0~5^2~5 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a73bc1275bb0939c51c496b1d50c516e6314eab2;p=git.git 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 Tested-by: Jeff King Acked-by: Daniel Barkalow Signed-off-by: Junio C Hamano --- diff --git a/builtin-clone.c b/builtin-clone.c index a7c075d0e..8713128e7 100644 --- 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 dc9d63dbf..593d1a387 100755 --- 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