diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2008-05-15 10:48:25 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-15 15:05:00 -0700 |
| commit | a73bc1275bb0939c51c496b1d50c516e6314eab2 (patch) | |
| tree | 855781cc4b511dc2f214bb218bd24203e7fbdf80 /builtin-clone.c | |
| parent | 8434c2f1afedb936e0ea8c07ce25733013c2f743 (diff) | |
| download | git-a73bc1275bb0939c51c496b1d50c516e6314eab2.tar.gz git-a73bc1275bb0939c51c496b1d50c516e6314eab2.tar.xz | |
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>
Diffstat (limited to 'builtin-clone.c')
| -rw-r--r-- | builtin-clone.c | 3 |
1 files changed, 3 insertions, 0 deletions
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); |