Makefile: fix shell quoting

diff --git a/builtin-clone.c b/builtin-clone.c
index 8713128e72da5681104434f944defb7f373db7e8..7ee82752699f837f89fcbea06b1a20aa286ae6cb 100644 (file)
--- a/builtin-clone.c
+++ b/builtin-clone.c
@@ -76,7 +76,7 @@ static char *get_repo_path(const char *repo, int *is_bundle)
                path = mkpath("%s%s", repo, suffix[i]);
                if (!stat(path, &st) && S_ISDIR(st.st_mode)) {
                        *is_bundle = 0;
-                       return xstrdup(make_absolute_path(path));
+                       return xstrdup(make_nonrelative_path(path));
                }
        }
 
@@ -85,7 +85,7 @@ static char *get_repo_path(const char *repo, int *is_bundle)
                path = mkpath("%s%s", repo, bundle_suffix[i]);
                if (!stat(path, &st) && S_ISREG(st.st_mode)) {
                        *is_bundle = 1;
-                       return xstrdup(make_absolute_path(path));
+                       return xstrdup(make_nonrelative_path(path));
                }
        }
 
@@ -207,14 +207,17 @@ static void copy_or_link_directory(char *src, char *dest)
 
                if (unlink(dest) && errno != ENOENT)
                        die("failed to unlink %s\n", dest);
-               if (option_no_hardlinks) {
-                       if (copy_file(dest, src, 0666))
-                               die("failed to copy file to %s\n", dest);
-               } else {
-                       if (link(src, dest))
+               if (!option_no_hardlinks) {
+                       if (!link(src, dest))
+                               continue;
+                       if (option_local)
                                die("failed to create link %s\n", dest);
+                       option_no_hardlinks = 1;
                }
+               if (copy_file(dest, src, 0666))
+                       die("failed to copy file to %s\n", dest);
        }
+       closedir(dir);
 }
 
 static const struct ref *clone_local(const char *src_repo,
@@ -334,6 +337,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
        const struct ref *refs, *head_points_at, *remote_head, *mapped_refs;
        char branch_top[256], key[256], value[256];
        struct strbuf reflog_msg;
+       struct transport *transport = NULL;
 
        struct refspec refspec;
 
@@ -397,6 +401,9 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 
        if (!option_bare) {
                junk_work_tree = work_tree;
+               if (safe_create_leading_directories_const(work_tree) < 0)
+                       die("could not create leading directories of '%s'",
+                                       work_tree);
                if (mkdir(work_tree, 0755))
                        die("could not create work tree dir '%s'.", work_tree);
                set_git_work_tree(work_tree);
@@ -407,15 +414,23 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 
        setenv(CONFIG_ENVIRONMENT, xstrdup(mkpath("%s/config", git_dir)), 1);
 
+       if (safe_create_leading_directories_const(git_dir) < 0)
+               die("could not create leading directories of '%s'", git_dir);
        set_git_dir(make_absolute_path(git_dir));
 
-       fprintf(stderr, "Initialize %s\n", git_dir);
        init_db(option_template, option_quiet ? INIT_DB_QUIET : 0);
 
+       /*
+        * At this point, the config exists, so we do not need the
+        * environment variable.  We actually need to unset it, too, to
+        * re-enable parsing of the global configs.
+        */
+       unsetenv(CONFIG_ENVIRONMENT);
+
        if (option_reference)
                setup_reference(git_dir);
 
-       git_config(git_default_config);
+       git_config(git_default_config, NULL);
 
        if (option_bare) {
                strcpy(branch_top, "refs/heads/");
@@ -444,7 +459,10 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
                refs = clone_local(path, git_dir);
        else {
                struct remote *remote = remote_get(argv[0]);
-               struct transport *transport = transport_get(remote, argv[0]);
+               transport = transport_get(remote, remote->url[0]);
+
+               if (!transport->get_refs_list || !transport->fetch)
+                       die("Don't know how to clone %s", transport->url);
 
                transport_set_option(transport, TRANS_OPT_KEEP, "yes");
 
@@ -511,6 +529,9 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
                option_no_checkout = 1;
        }
 
+       if (transport)
+               transport_unlock_pack(transport);
+
        if (!option_no_checkout) {
                struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));
                struct unpack_trees_options opts;