Merge branch 'jh/msvc'

diff --git a/builtin/clone.c b/builtin/clone.c
index 5b9ebe994761bd7b45209037b6eab63e28a78efb..a4fe72879d43e4e42d6cbb5a4dada2f7a111b872 100644 (file)
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -494,7 +494,7 @@ static enum {
 static const char junk_leave_repo_msg[] =
 N_("Clone succeeded, but checkout failed.\n"
    "You can inspect what was checked out with 'git status'\n"
-   "and retry the checkout with 'git checkout -f HEAD'\n");
+   "and retry with 'git restore --source=HEAD :/'\n");
 
 static void remove_junk(void)
 {
@@ -1252,7 +1252,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
        transport_disconnect(transport);
 
        if (option_dissociate) {
-               close_all_packs(the_repository->objects);
+               close_object_store(the_repository->objects);
                dissociate_from_references();
        }