diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2008-05-15 13:48:25 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-16 02:05:00 +0400 |
| commit | a73bc1275bb0939c51c496b1d50c516e6314eab2 (patch) | |
| tree | 855781cc4b511dc2f214bb218bd24203e7fbdf80 | |
| parent | 8434c2f1afedb936e0ea8c07ce25733013c2f743 (diff) | |
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>
| -rw-r--r-- | builtin-clone.c | 3 | ||||
| -rwxr-xr-x | t/t5601-clone.sh | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/builtin-clone.c b/builtin-clone.c index a7c075d0e2..8713128e72 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 dc9d63dbf9..593d1a3877 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 |