Code

refuse to merge during a merge
[git.git] / builtin-clone.c
1 /*
2  * Builtin "git clone"
3  *
4  * Copyright (c) 2007 Kristian Høgsberg <krh@redhat.com>,
5  *               2008 Daniel Barkalow <barkalow@iabervon.org>
6  * Based on git-commit.sh by Junio C Hamano and Linus Torvalds
7  *
8  * Clone a repository into a different directory that does not yet exist.
9  */
11 #include "cache.h"
12 #include "parse-options.h"
13 #include "fetch-pack.h"
14 #include "refs.h"
15 #include "tree.h"
16 #include "tree-walk.h"
17 #include "unpack-trees.h"
18 #include "transport.h"
19 #include "strbuf.h"
20 #include "dir.h"
21 #include "pack-refs.h"
22 #include "sigchain.h"
23 #include "branch.h"
24 #include "remote.h"
25 #include "run-command.h"
27 /*
28  * Overall FIXMEs:
29  *  - respect DB_ENVIRONMENT for .git/objects.
30  *
31  * Implementation notes:
32  *  - dropping use-separate-remote and no-separate-remote compatibility
33  *
34  */
35 static const char * const builtin_clone_usage[] = {
36         "git clone [options] [--] <repo> [<dir>]",
37         NULL
38 };
40 static int option_quiet, option_no_checkout, option_bare, option_mirror;
41 static int option_local, option_no_hardlinks, option_shared;
42 static char *option_template, *option_reference, *option_depth;
43 static char *option_origin = NULL;
44 static char *option_upload_pack = "git-upload-pack";
45 static int option_verbose;
47 static struct option builtin_clone_options[] = {
48         OPT__QUIET(&option_quiet),
49         OPT__VERBOSE(&option_verbose),
50         OPT_BOOLEAN('n', "no-checkout", &option_no_checkout,
51                     "don't create a checkout"),
52         OPT_BOOLEAN(0, "bare", &option_bare, "create a bare repository"),
53         OPT_BOOLEAN(0, "naked", &option_bare, "create a bare repository"),
54         OPT_BOOLEAN(0, "mirror", &option_mirror,
55                     "create a mirror repository (implies bare)"),
56         OPT_BOOLEAN('l', "local", &option_local,
57                     "to clone from a local repository"),
58         OPT_BOOLEAN(0, "no-hardlinks", &option_no_hardlinks,
59                     "don't use local hardlinks, always copy"),
60         OPT_BOOLEAN('s', "shared", &option_shared,
61                     "setup as shared repository"),
62         OPT_STRING(0, "template", &option_template, "path",
63                    "path the template repository"),
64         OPT_STRING(0, "reference", &option_reference, "repo",
65                    "reference repository"),
66         OPT_STRING('o', "origin", &option_origin, "branch",
67                    "use <branch> instead of 'origin' to track upstream"),
68         OPT_STRING('u', "upload-pack", &option_upload_pack, "path",
69                    "path to git-upload-pack on the remote"),
70         OPT_STRING(0, "depth", &option_depth, "depth",
71                     "create a shallow clone of that depth"),
73         OPT_END()
74 };
76 static char *get_repo_path(const char *repo, int *is_bundle)
77 {
78         static char *suffix[] = { "/.git", ".git", "" };
79         static char *bundle_suffix[] = { ".bundle", "" };
80         struct stat st;
81         int i;
83         for (i = 0; i < ARRAY_SIZE(suffix); i++) {
84                 const char *path;
85                 path = mkpath("%s%s", repo, suffix[i]);
86                 if (is_directory(path)) {
87                         *is_bundle = 0;
88                         return xstrdup(make_nonrelative_path(path));
89                 }
90         }
92         for (i = 0; i < ARRAY_SIZE(bundle_suffix); i++) {
93                 const char *path;
94                 path = mkpath("%s%s", repo, bundle_suffix[i]);
95                 if (!stat(path, &st) && S_ISREG(st.st_mode)) {
96                         *is_bundle = 1;
97                         return xstrdup(make_nonrelative_path(path));
98                 }
99         }
101         return NULL;
104 static char *guess_dir_name(const char *repo, int is_bundle, int is_bare)
106         const char *end = repo + strlen(repo), *start;
108         /*
109          * Strip trailing slashes and /.git
110          */
111         while (repo < end && is_dir_sep(end[-1]))
112                 end--;
113         if (end - repo > 5 && is_dir_sep(end[-5]) &&
114             !strncmp(end - 4, ".git", 4)) {
115                 end -= 5;
116                 while (repo < end && is_dir_sep(end[-1]))
117                         end--;
118         }
120         /*
121          * Find last component, but be prepared that repo could have
122          * the form  "remote.example.com:foo.git", i.e. no slash
123          * in the directory part.
124          */
125         start = end;
126         while (repo < start && !is_dir_sep(start[-1]) && start[-1] != ':')
127                 start--;
129         /*
130          * Strip .{bundle,git}.
131          */
132         if (is_bundle) {
133                 if (end - start > 7 && !strncmp(end - 7, ".bundle", 7))
134                         end -= 7;
135         } else {
136                 if (end - start > 4 && !strncmp(end - 4, ".git", 4))
137                         end -= 4;
138         }
140         if (is_bare) {
141                 struct strbuf result = STRBUF_INIT;
142                 strbuf_addf(&result, "%.*s.git", (int)(end - start), start);
143                 return strbuf_detach(&result, 0);
144         }
146         return xstrndup(start, end - start);
149 static void strip_trailing_slashes(char *dir)
151         char *end = dir + strlen(dir);
153         while (dir < end - 1 && is_dir_sep(end[-1]))
154                 end--;
155         *end = '\0';
158 static void setup_reference(const char *repo)
160         const char *ref_git;
161         char *ref_git_copy;
163         struct remote *remote;
164         struct transport *transport;
165         const struct ref *extra;
167         ref_git = make_absolute_path(option_reference);
169         if (is_directory(mkpath("%s/.git/objects", ref_git)))
170                 ref_git = mkpath("%s/.git", ref_git);
171         else if (!is_directory(mkpath("%s/objects", ref_git)))
172                 die("reference repository '%s' is not a local directory.",
173                     option_reference);
175         ref_git_copy = xstrdup(ref_git);
177         add_to_alternates_file(ref_git_copy);
179         remote = remote_get(ref_git_copy);
180         transport = transport_get(remote, ref_git_copy);
181         for (extra = transport_get_remote_refs(transport); extra;
182              extra = extra->next)
183                 add_extra_ref(extra->name, extra->old_sha1, 0);
185         transport_disconnect(transport);
187         free(ref_git_copy);
190 static void copy_or_link_directory(struct strbuf *src, struct strbuf *dest)
192         struct dirent *de;
193         struct stat buf;
194         int src_len, dest_len;
195         DIR *dir;
197         dir = opendir(src->buf);
198         if (!dir)
199                 die("failed to open %s", src->buf);
201         if (mkdir(dest->buf, 0777)) {
202                 if (errno != EEXIST)
203                         die("failed to create directory %s", dest->buf);
204                 else if (stat(dest->buf, &buf))
205                         die("failed to stat %s", dest->buf);
206                 else if (!S_ISDIR(buf.st_mode))
207                         die("%s exists and is not a directory", dest->buf);
208         }
210         strbuf_addch(src, '/');
211         src_len = src->len;
212         strbuf_addch(dest, '/');
213         dest_len = dest->len;
215         while ((de = readdir(dir)) != NULL) {
216                 strbuf_setlen(src, src_len);
217                 strbuf_addstr(src, de->d_name);
218                 strbuf_setlen(dest, dest_len);
219                 strbuf_addstr(dest, de->d_name);
220                 if (stat(src->buf, &buf)) {
221                         warning ("failed to stat %s\n", src->buf);
222                         continue;
223                 }
224                 if (S_ISDIR(buf.st_mode)) {
225                         if (de->d_name[0] != '.')
226                                 copy_or_link_directory(src, dest);
227                         continue;
228                 }
230                 if (unlink(dest->buf) && errno != ENOENT)
231                         die("failed to unlink %s: %s",
232                             dest->buf, strerror(errno));
233                 if (!option_no_hardlinks) {
234                         if (!link(src->buf, dest->buf))
235                                 continue;
236                         if (option_local)
237                                 die("failed to create link %s", dest->buf);
238                         option_no_hardlinks = 1;
239                 }
240                 if (copy_file(dest->buf, src->buf, 0666))
241                         die("failed to copy file to %s", dest->buf);
242         }
243         closedir(dir);
246 static const struct ref *clone_local(const char *src_repo,
247                                      const char *dest_repo)
249         const struct ref *ret;
250         struct strbuf src = STRBUF_INIT;
251         struct strbuf dest = STRBUF_INIT;
252         struct remote *remote;
253         struct transport *transport;
255         if (option_shared)
256                 add_to_alternates_file(src_repo);
257         else {
258                 strbuf_addf(&src, "%s/objects", src_repo);
259                 strbuf_addf(&dest, "%s/objects", dest_repo);
260                 copy_or_link_directory(&src, &dest);
261                 strbuf_release(&src);
262                 strbuf_release(&dest);
263         }
265         remote = remote_get(src_repo);
266         transport = transport_get(remote, src_repo);
267         ret = transport_get_remote_refs(transport);
268         transport_disconnect(transport);
269         return ret;
272 static const char *junk_work_tree;
273 static const char *junk_git_dir;
274 static pid_t junk_pid;
276 static void remove_junk(void)
278         struct strbuf sb = STRBUF_INIT;
279         if (getpid() != junk_pid)
280                 return;
281         if (junk_git_dir) {
282                 strbuf_addstr(&sb, junk_git_dir);
283                 remove_dir_recursively(&sb, 0);
284                 strbuf_reset(&sb);
285         }
286         if (junk_work_tree) {
287                 strbuf_addstr(&sb, junk_work_tree);
288                 remove_dir_recursively(&sb, 0);
289                 strbuf_reset(&sb);
290         }
293 static void remove_junk_on_signal(int signo)
295         remove_junk();
296         sigchain_pop(signo);
297         raise(signo);
300 static struct ref *write_remote_refs(const struct ref *refs,
301                 struct refspec *refspec, const char *reflog)
303         struct ref *local_refs = NULL;
304         struct ref **tail = &local_refs;
305         struct ref *r;
307         get_fetch_map(refs, refspec, &tail, 0);
308         if (!option_mirror)
309                 get_fetch_map(refs, tag_refspec, &tail, 0);
311         for (r = local_refs; r; r = r->next)
312                 add_extra_ref(r->peer_ref->name, r->old_sha1, 0);
314         pack_refs(PACK_REFS_ALL);
315         clear_extra_refs();
317         return local_refs;
320 int cmd_clone(int argc, const char **argv, const char *prefix)
322         int is_bundle = 0;
323         struct stat buf;
324         const char *repo_name, *repo, *work_tree, *git_dir;
325         char *path, *dir;
326         int dest_exists;
327         const struct ref *refs, *head_points_at, *remote_head, *mapped_refs;
328         struct strbuf key = STRBUF_INIT, value = STRBUF_INIT;
329         struct strbuf branch_top = STRBUF_INIT, reflog_msg = STRBUF_INIT;
330         struct transport *transport = NULL;
331         char *src_ref_prefix = "refs/heads/";
332         int err = 0;
334         struct refspec *refspec;
335         const char *fetch_pattern;
337         junk_pid = getpid();
339         argc = parse_options(argc, argv, builtin_clone_options,
340                              builtin_clone_usage, 0);
342         if (argc == 0)
343                 die("You must specify a repository to clone.");
345         if (option_mirror)
346                 option_bare = 1;
348         if (option_bare) {
349                 if (option_origin)
350                         die("--bare and --origin %s options are incompatible.",
351                             option_origin);
352                 option_no_checkout = 1;
353         }
355         if (!option_origin)
356                 option_origin = "origin";
358         repo_name = argv[0];
360         path = get_repo_path(repo_name, &is_bundle);
361         if (path)
362                 repo = xstrdup(make_nonrelative_path(repo_name));
363         else if (!strchr(repo_name, ':'))
364                 repo = xstrdup(make_absolute_path(repo_name));
365         else
366                 repo = repo_name;
368         if (argc == 2)
369                 dir = xstrdup(argv[1]);
370         else
371                 dir = guess_dir_name(repo_name, is_bundle, option_bare);
372         strip_trailing_slashes(dir);
374         dest_exists = !stat(dir, &buf);
375         if (dest_exists && !is_empty_dir(dir))
376                 die("destination path '%s' already exists and is not "
377                         "an empty directory.", dir);
379         strbuf_addf(&reflog_msg, "clone: from %s", repo);
381         if (option_bare)
382                 work_tree = NULL;
383         else {
384                 work_tree = getenv("GIT_WORK_TREE");
385                 if (work_tree && !stat(work_tree, &buf))
386                         die("working tree '%s' already exists.", work_tree);
387         }
389         if (option_bare || work_tree)
390                 git_dir = xstrdup(dir);
391         else {
392                 work_tree = dir;
393                 git_dir = xstrdup(mkpath("%s/.git", dir));
394         }
396         if (!option_bare) {
397                 junk_work_tree = work_tree;
398                 if (safe_create_leading_directories_const(work_tree) < 0)
399                         die("could not create leading directories of '%s': %s",
400                                         work_tree, strerror(errno));
401                 if (!dest_exists && mkdir(work_tree, 0755))
402                         die("could not create work tree dir '%s': %s.",
403                                         work_tree, strerror(errno));
404                 set_git_work_tree(work_tree);
405         }
406         junk_git_dir = git_dir;
407         atexit(remove_junk);
408         sigchain_push_common(remove_junk_on_signal);
410         setenv(CONFIG_ENVIRONMENT, mkpath("%s/config", git_dir), 1);
412         if (safe_create_leading_directories_const(git_dir) < 0)
413                 die("could not create leading directories of '%s'", git_dir);
414         set_git_dir(make_absolute_path(git_dir));
416         init_db(option_template, option_quiet ? INIT_DB_QUIET : 0);
418         /*
419          * At this point, the config exists, so we do not need the
420          * environment variable.  We actually need to unset it, too, to
421          * re-enable parsing of the global configs.
422          */
423         unsetenv(CONFIG_ENVIRONMENT);
425         if (option_reference)
426                 setup_reference(git_dir);
428         git_config(git_default_config, NULL);
430         if (option_bare) {
431                 if (option_mirror)
432                         src_ref_prefix = "refs/";
433                 strbuf_addstr(&branch_top, src_ref_prefix);
435                 git_config_set("core.bare", "true");
436         } else {
437                 strbuf_addf(&branch_top, "refs/remotes/%s/", option_origin);
438         }
440         strbuf_addf(&value, "+%s*:%s*", src_ref_prefix, branch_top.buf);
442         if (option_mirror || !option_bare) {
443                 /* Configure the remote */
444                 strbuf_addf(&key, "remote.%s.fetch", option_origin);
445                 git_config_set_multivar(key.buf, value.buf, "^$", 0);
446                 strbuf_reset(&key);
448                 if (option_mirror) {
449                         strbuf_addf(&key, "remote.%s.mirror", option_origin);
450                         git_config_set(key.buf, "true");
451                         strbuf_reset(&key);
452                 }
454                 strbuf_addf(&key, "remote.%s.url", option_origin);
455                 git_config_set(key.buf, repo);
456                 strbuf_reset(&key);
457         }
459         fetch_pattern = value.buf;
460         refspec = parse_fetch_refspec(1, &fetch_pattern);
462         strbuf_reset(&value);
464         if (path && !is_bundle)
465                 refs = clone_local(path, git_dir);
466         else {
467                 struct remote *remote = remote_get(argv[0]);
468                 transport = transport_get(remote, remote->url[0]);
470                 if (!transport->get_refs_list || !transport->fetch)
471                         die("Don't know how to clone %s", transport->url);
473                 transport_set_option(transport, TRANS_OPT_KEEP, "yes");
475                 if (option_depth)
476                         transport_set_option(transport, TRANS_OPT_DEPTH,
477                                              option_depth);
479                 if (option_quiet)
480                         transport->verbose = -1;
481                 else if (option_verbose)
482                         transport->progress = 1;
484                 if (option_upload_pack)
485                         transport_set_option(transport, TRANS_OPT_UPLOADPACK,
486                                              option_upload_pack);
488                 refs = transport_get_remote_refs(transport);
489                 if(refs)
490                         transport_fetch_refs(transport, refs);
491         }
493         if (refs) {
494                 clear_extra_refs();
496                 mapped_refs = write_remote_refs(refs, refspec, reflog_msg.buf);
498                 remote_head = find_ref_by_name(refs, "HEAD");
499                 head_points_at = guess_remote_head(remote_head, mapped_refs, 0);
500         }
501         else {
502                 warning("You appear to have cloned an empty repository.");
503                 head_points_at = NULL;
504                 remote_head = NULL;
505                 option_no_checkout = 1;
506                 if (!option_bare)
507                         install_branch_config(0, "master", option_origin,
508                                               "refs/heads/master");
509         }
511         if (head_points_at) {
512                 /* Local default branch link */
513                 create_symref("HEAD", head_points_at->name, NULL);
515                 if (!option_bare) {
516                         struct strbuf head_ref = STRBUF_INIT;
517                         const char *head = head_points_at->name;
519                         if (!prefixcmp(head, "refs/heads/"))
520                                 head += 11;
522                         /* Set up the initial local branch */
524                         /* Local branch initial value */
525                         update_ref(reflog_msg.buf, "HEAD",
526                                    head_points_at->old_sha1,
527                                    NULL, 0, DIE_ON_ERR);
529                         strbuf_addstr(&head_ref, branch_top.buf);
530                         strbuf_addstr(&head_ref, "HEAD");
532                         /* Remote branch link */
533                         create_symref(head_ref.buf,
534                                       head_points_at->peer_ref->name,
535                                       reflog_msg.buf);
537                         install_branch_config(0, head, option_origin,
538                                               head_points_at->name);
539                 }
540         } else if (remote_head) {
541                 /* Source had detached HEAD pointing somewhere. */
542                 if (!option_bare)
543                         update_ref(reflog_msg.buf, "HEAD",
544                                    remote_head->old_sha1,
545                                    NULL, REF_NODEREF, DIE_ON_ERR);
546         } else {
547                 /* Nothing to checkout out */
548                 if (!option_no_checkout)
549                         warning("remote HEAD refers to nonexistent ref, "
550                                 "unable to checkout.\n");
551                 option_no_checkout = 1;
552         }
554         if (transport)
555                 transport_unlock_pack(transport);
557         if (!option_no_checkout) {
558                 struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));
559                 struct unpack_trees_options opts;
560                 struct tree *tree;
561                 struct tree_desc t;
562                 int fd;
564                 /* We need to be in the new work tree for the checkout */
565                 setup_work_tree();
567                 fd = hold_locked_index(lock_file, 1);
569                 memset(&opts, 0, sizeof opts);
570                 opts.update = 1;
571                 opts.merge = 1;
572                 opts.fn = oneway_merge;
573                 opts.verbose_update = !option_quiet;
574                 opts.src_index = &the_index;
575                 opts.dst_index = &the_index;
577                 tree = parse_tree_indirect(remote_head->old_sha1);
578                 parse_tree(tree);
579                 init_tree_desc(&t, tree->buffer, tree->size);
580                 unpack_trees(1, &t, &opts);
582                 if (write_cache(fd, active_cache, active_nr) ||
583                     commit_locked_index(lock_file))
584                         die("unable to write new index file");
586                 err |= run_hook(NULL, "post-checkout", sha1_to_hex(null_sha1),
587                                 sha1_to_hex(remote_head->old_sha1), "1", NULL);
588         }
590         strbuf_release(&reflog_msg);
591         strbuf_release(&branch_top);
592         strbuf_release(&key);
593         strbuf_release(&value);
594         junk_pid = 0;
595         return err;