Merge branch 'sp/maint-smart-http-sans-100-continue'

diff --git a/builtin/clone.c b/builtin/clone.c
index 19ed64041d0575ee1ad49071dfe1e671114b8ae3..2ee1fa984620de4fad79ce94d4f993f5e83a053d 100644 (file)
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -66,8 +66,10 @@ static struct option builtin_clone_options[] = {
                    "setup as shared repository"),
        OPT_BOOLEAN(0, "recursive", &option_recursive,
                    "initialize submodules in the clone"),
-       OPT_STRING(0, "template", &option_template, "path",
-                  "path the template repository"),
+       OPT_BOOLEAN(0, "recurse-submodules", &option_recursive,
+                   "initialize submodules in the clone"),
+       OPT_STRING(0, "template", &option_template, "template-directory",
+                  "directory from which templates will be used"),
        OPT_STRING(0, "reference", &option_reference, "repo",
                   "reference repository"),
        OPT_STRING('o', "origin", &option_origin, "branch",
@@ -411,7 +413,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
        if (path)
                repo = xstrdup(make_nonrelative_path(repo_name));
        else if (!strchr(repo_name, ':'))
-               repo = xstrdup(make_absolute_path(repo_name));
+               die("repository '%s' does not exist", repo_name);
        else
                repo = repo_name;
        is_local = path && !is_bundle;