Merge branch 'ab/config-based-hooks-2'

[thirdparty/git.git] / builtin / clone.c

diff --git a/builtin/clone.c b/builtin/clone.c
index ee27b9f8114bd7041183e2250c80ee47b2a9c78a..b19925f373409adfae5450b48e2f0c8c780c4b0a 100644 (file)
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -634,7 +634,7 @@ static int git_sparse_checkout_init(const char *repo)
 {
        struct strvec argv = STRVEC_INIT;
        int result = 0;
-       strvec_pushl(&argv, "-C", repo, "sparse-checkout", "init", NULL);
+       strvec_pushl(&argv, "-C", repo, "sparse-checkout", "set", NULL);
 
        /*
         * We must apply the setting in the current process
@@ -901,10 +901,10 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 
        if (option_bare) {
                if (option_origin)
-                       die(_("--bare and --origin %s options are incompatible."),
-                           option_origin);
+                       die(_("options '%s' and '%s %s' cannot be used together"),
+                           "--bare", "--origin", option_origin);
                if (real_git_dir)
-                       die(_("--bare and --separate-git-dir are incompatible."));
+                       die(_("options '%s' and '%s' cannot be used together"), "--bare", "--separate-git-dir");
                option_no_checkout = 1;
        }
 
@@ -1291,7 +1291,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
         */
        submodule_progress = transport->progress;
 
-       transport_unlock_pack(transport);
+       transport_unlock_pack(transport, 0);
        transport_disconnect(transport);
 
        if (option_dissociate) {