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 /t/lib-read-tree-m-3way.sh | |
| parent | Build in clone (diff) | |
| download | tgif-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 't/lib-read-tree-m-3way.sh')
0 files changed, 0 insertions, 0 deletions