fetch --tags: fetch tags *in addition to* other stuff
[alt-git.git] / builtin / fetch.c
blob887fa3e5810356824e3b16d6bd48b67c051b1eff
1 /*
2 * "git fetch"
3 */
4 #include "cache.h"
5 #include "refs.h"
6 #include "commit.h"
7 #include "builtin.h"
8 #include "string-list.h"
9 #include "remote.h"
10 #include "transport.h"
11 #include "run-command.h"
12 #include "parse-options.h"
13 #include "sigchain.h"
14 #include "transport.h"
15 #include "submodule.h"
16 #include "connected.h"
17 #include "argv-array.h"
19 static const char * const builtin_fetch_usage[] = {
20 N_("git fetch [<options>] [<repository> [<refspec>...]]"),
21 N_("git fetch [<options>] <group>"),
22 N_("git fetch --multiple [<options>] [(<repository> | <group>)...]"),
23 N_("git fetch --all [<options>]"),
24 NULL
27 enum {
28 TAGS_UNSET = 0,
29 TAGS_DEFAULT = 1,
30 TAGS_SET = 2
33 static int fetch_prune_config = -1; /* unspecified */
34 static int prune = -1; /* unspecified */
35 #define PRUNE_BY_DEFAULT 0 /* do we prune by default? */
37 static int all, append, dry_run, force, keep, multiple, update_head_ok, verbosity;
38 static int progress = -1, recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
39 static int tags = TAGS_DEFAULT, unshallow;
40 static const char *depth;
41 static const char *upload_pack;
42 static struct strbuf default_rla = STRBUF_INIT;
43 static struct transport *gtransport;
44 static struct transport *gsecondary;
45 static const char *submodule_prefix = "";
46 static const char *recurse_submodules_default;
48 static int option_parse_recurse_submodules(const struct option *opt,
49 const char *arg, int unset)
51 if (unset) {
52 recurse_submodules = RECURSE_SUBMODULES_OFF;
53 } else {
54 if (arg)
55 recurse_submodules = parse_fetch_recurse_submodules_arg(opt->long_name, arg);
56 else
57 recurse_submodules = RECURSE_SUBMODULES_ON;
59 return 0;
62 static int git_fetch_config(const char *k, const char *v, void *cb)
64 if (!strcmp(k, "fetch.prune")) {
65 fetch_prune_config = git_config_bool(k, v);
66 return 0;
68 return 0;
71 static struct option builtin_fetch_options[] = {
72 OPT__VERBOSITY(&verbosity),
73 OPT_BOOL(0, "all", &all,
74 N_("fetch from all remotes")),
75 OPT_BOOL('a', "append", &append,
76 N_("append to .git/FETCH_HEAD instead of overwriting")),
77 OPT_STRING(0, "upload-pack", &upload_pack, N_("path"),
78 N_("path to upload pack on remote end")),
79 OPT__FORCE(&force, N_("force overwrite of local branch")),
80 OPT_BOOL('m', "multiple", &multiple,
81 N_("fetch from multiple remotes")),
82 OPT_SET_INT('t', "tags", &tags,
83 N_("fetch all tags and associated objects"), TAGS_SET),
84 OPT_SET_INT('n', NULL, &tags,
85 N_("do not fetch all tags (--no-tags)"), TAGS_UNSET),
86 OPT_BOOL('p', "prune", &prune,
87 N_("prune remote-tracking branches no longer on remote")),
88 { OPTION_CALLBACK, 0, "recurse-submodules", NULL, N_("on-demand"),
89 N_("control recursive fetching of submodules"),
90 PARSE_OPT_OPTARG, option_parse_recurse_submodules },
91 OPT_BOOL(0, "dry-run", &dry_run,
92 N_("dry run")),
93 OPT_BOOL('k', "keep", &keep, N_("keep downloaded pack")),
94 OPT_BOOL('u', "update-head-ok", &update_head_ok,
95 N_("allow updating of HEAD ref")),
96 OPT_BOOL(0, "progress", &progress, N_("force progress reporting")),
97 OPT_STRING(0, "depth", &depth, N_("depth"),
98 N_("deepen history of shallow clone")),
99 { OPTION_SET_INT, 0, "unshallow", &unshallow, NULL,
100 N_("convert to a complete repository"),
101 PARSE_OPT_NONEG | PARSE_OPT_NOARG, NULL, 1 },
102 { OPTION_STRING, 0, "submodule-prefix", &submodule_prefix, N_("dir"),
103 N_("prepend this to submodule path output"), PARSE_OPT_HIDDEN },
104 { OPTION_STRING, 0, "recurse-submodules-default",
105 &recurse_submodules_default, NULL,
106 N_("default mode for recursion"), PARSE_OPT_HIDDEN },
107 OPT_END()
110 static void unlock_pack(void)
112 if (gtransport)
113 transport_unlock_pack(gtransport);
114 if (gsecondary)
115 transport_unlock_pack(gsecondary);
118 static void unlock_pack_on_signal(int signo)
120 unlock_pack();
121 sigchain_pop(signo);
122 raise(signo);
125 static void add_merge_config(struct ref **head,
126 const struct ref *remote_refs,
127 struct branch *branch,
128 struct ref ***tail)
130 int i;
132 for (i = 0; i < branch->merge_nr; i++) {
133 struct ref *rm, **old_tail = *tail;
134 struct refspec refspec;
136 for (rm = *head; rm; rm = rm->next) {
137 if (branch_merge_matches(branch, i, rm->name)) {
138 rm->fetch_head_status = FETCH_HEAD_MERGE;
139 break;
142 if (rm)
143 continue;
146 * Not fetched to a remote-tracking branch? We need to fetch
147 * it anyway to allow this branch's "branch.$name.merge"
148 * to be honored by 'git pull', but we do not have to
149 * fail if branch.$name.merge is misconfigured to point
150 * at a nonexisting branch. If we were indeed called by
151 * 'git pull', it will notice the misconfiguration because
152 * there is no entry in the resulting FETCH_HEAD marked
153 * for merging.
155 memset(&refspec, 0, sizeof(refspec));
156 refspec.src = branch->merge[i]->src;
157 get_fetch_map(remote_refs, &refspec, tail, 1);
158 for (rm = *old_tail; rm; rm = rm->next)
159 rm->fetch_head_status = FETCH_HEAD_MERGE;
163 static int add_existing(const char *refname, const unsigned char *sha1,
164 int flag, void *cbdata)
166 struct string_list *list = (struct string_list *)cbdata;
167 struct string_list_item *item = string_list_insert(list, refname);
168 item->util = xmalloc(20);
169 hashcpy(item->util, sha1);
170 return 0;
173 static int will_fetch(struct ref **head, const unsigned char *sha1)
175 struct ref *rm = *head;
176 while (rm) {
177 if (!hashcmp(rm->old_sha1, sha1))
178 return 1;
179 rm = rm->next;
181 return 0;
184 static void find_non_local_tags(struct transport *transport,
185 struct ref **head,
186 struct ref ***tail)
188 struct string_list existing_refs = STRING_LIST_INIT_DUP;
189 struct string_list remote_refs = STRING_LIST_INIT_NODUP;
190 const struct ref *ref;
191 struct string_list_item *item = NULL;
193 for_each_ref(add_existing, &existing_refs);
194 for (ref = transport_get_remote_refs(transport); ref; ref = ref->next) {
195 if (prefixcmp(ref->name, "refs/tags/"))
196 continue;
199 * The peeled ref always follows the matching base
200 * ref, so if we see a peeled ref that we don't want
201 * to fetch then we can mark the ref entry in the list
202 * as one to ignore by setting util to NULL.
204 if (!suffixcmp(ref->name, "^{}")) {
205 if (item && !has_sha1_file(ref->old_sha1) &&
206 !will_fetch(head, ref->old_sha1) &&
207 !has_sha1_file(item->util) &&
208 !will_fetch(head, item->util))
209 item->util = NULL;
210 item = NULL;
211 continue;
215 * If item is non-NULL here, then we previously saw a
216 * ref not followed by a peeled reference, so we need
217 * to check if it is a lightweight tag that we want to
218 * fetch.
220 if (item && !has_sha1_file(item->util) &&
221 !will_fetch(head, item->util))
222 item->util = NULL;
224 item = NULL;
226 /* skip duplicates and refs that we already have */
227 if (string_list_has_string(&remote_refs, ref->name) ||
228 string_list_has_string(&existing_refs, ref->name))
229 continue;
231 item = string_list_insert(&remote_refs, ref->name);
232 item->util = (void *)ref->old_sha1;
234 string_list_clear(&existing_refs, 1);
237 * We may have a final lightweight tag that needs to be
238 * checked to see if it needs fetching.
240 if (item && !has_sha1_file(item->util) &&
241 !will_fetch(head, item->util))
242 item->util = NULL;
245 * For all the tags in the remote_refs string list,
246 * add them to the list of refs to be fetched
248 for_each_string_list_item(item, &remote_refs) {
249 /* Unless we have already decided to ignore this item... */
250 if (item->util)
252 struct ref *rm = alloc_ref(item->string);
253 rm->peer_ref = alloc_ref(item->string);
254 hashcpy(rm->old_sha1, item->util);
255 **tail = rm;
256 *tail = &rm->next;
260 string_list_clear(&remote_refs, 0);
263 static struct ref *get_ref_map(struct transport *transport,
264 struct refspec *refspecs, int refspec_count,
265 int tags, int *autotags)
267 int i;
268 struct ref *rm;
269 struct ref *ref_map = NULL;
270 struct ref **tail = &ref_map;
272 /* opportunistically-updated references: */
273 struct ref *orefs = NULL, **oref_tail = &orefs;
275 const struct ref *remote_refs = transport_get_remote_refs(transport);
277 if (refspec_count) {
278 for (i = 0; i < refspec_count; i++) {
279 get_fetch_map(remote_refs, &refspecs[i], &tail, 0);
280 if (refspecs[i].dst && refspecs[i].dst[0])
281 *autotags = 1;
283 /* Merge everything on the command line (but not --tags) */
284 for (rm = ref_map; rm; rm = rm->next)
285 rm->fetch_head_status = FETCH_HEAD_MERGE;
288 * For any refs that we happen to be fetching via
289 * command-line arguments, the destination ref might
290 * have been missing or have been different than the
291 * remote-tracking ref that would be derived from the
292 * configured refspec. In these cases, we want to
293 * take the opportunity to update their configured
294 * remote-tracking reference. However, we do not want
295 * to mention these entries in FETCH_HEAD at all, as
296 * they would simply be duplicates of existing
297 * entries, so we set them FETCH_HEAD_IGNORE below.
299 * We compute these entries now, based only on the
300 * refspecs specified on the command line. But we add
301 * them to the list following the refspecs resulting
302 * from the tags option so that one of the latter,
303 * which has FETCH_HEAD_NOT_FOR_MERGE, is not removed
304 * by ref_remove_duplicates() in favor of one of these
305 * opportunistic entries with FETCH_HEAD_IGNORE.
307 for (i = 0; i < transport->remote->fetch_refspec_nr; i++)
308 get_fetch_map(ref_map, &transport->remote->fetch[i],
309 &oref_tail, 1);
311 if (tags == TAGS_SET)
312 get_fetch_map(remote_refs, tag_refspec, &tail, 0);
313 } else {
314 /* Use the defaults */
315 struct remote *remote = transport->remote;
316 struct branch *branch = branch_get(NULL);
317 int has_merge = branch_has_merge_config(branch);
318 if (remote &&
319 (remote->fetch_refspec_nr ||
320 /* Note: has_merge implies non-NULL branch->remote_name */
321 (has_merge && !strcmp(branch->remote_name, remote->name)))) {
322 for (i = 0; i < remote->fetch_refspec_nr; i++) {
323 get_fetch_map(remote_refs, &remote->fetch[i], &tail, 0);
324 if (remote->fetch[i].dst &&
325 remote->fetch[i].dst[0])
326 *autotags = 1;
327 if (!i && !has_merge && ref_map &&
328 !remote->fetch[0].pattern)
329 ref_map->fetch_head_status = FETCH_HEAD_MERGE;
332 * if the remote we're fetching from is the same
333 * as given in branch.<name>.remote, we add the
334 * ref given in branch.<name>.merge, too.
336 * Note: has_merge implies non-NULL branch->remote_name
338 if (has_merge &&
339 !strcmp(branch->remote_name, remote->name))
340 add_merge_config(&ref_map, remote_refs, branch, &tail);
341 } else {
342 ref_map = get_remote_ref(remote_refs, "HEAD");
343 if (!ref_map)
344 die(_("Couldn't find remote ref HEAD"));
345 ref_map->fetch_head_status = FETCH_HEAD_MERGE;
346 tail = &ref_map->next;
350 if (tags == TAGS_SET)
351 /* also fetch all tags */
352 get_fetch_map(remote_refs, tag_refspec, &tail, 0);
353 else if (tags == TAGS_DEFAULT && *autotags)
354 find_non_local_tags(transport, &ref_map, &tail);
356 /* Now append any refs to be updated opportunistically: */
357 *tail = orefs;
358 for (rm = orefs; rm; rm = rm->next) {
359 rm->fetch_head_status = FETCH_HEAD_IGNORE;
360 tail = &rm->next;
363 ref_remove_duplicates(ref_map);
365 return ref_map;
368 #define STORE_REF_ERROR_OTHER 1
369 #define STORE_REF_ERROR_DF_CONFLICT 2
371 static int s_update_ref(const char *action,
372 struct ref *ref,
373 int check_old)
375 char msg[1024];
376 char *rla = getenv("GIT_REFLOG_ACTION");
377 static struct ref_lock *lock;
379 if (dry_run)
380 return 0;
381 if (!rla)
382 rla = default_rla.buf;
383 snprintf(msg, sizeof(msg), "%s: %s", rla, action);
384 lock = lock_any_ref_for_update(ref->name,
385 check_old ? ref->old_sha1 : NULL,
386 0, NULL);
387 if (!lock)
388 return errno == ENOTDIR ? STORE_REF_ERROR_DF_CONFLICT :
389 STORE_REF_ERROR_OTHER;
390 if (write_ref_sha1(lock, ref->new_sha1, msg) < 0)
391 return errno == ENOTDIR ? STORE_REF_ERROR_DF_CONFLICT :
392 STORE_REF_ERROR_OTHER;
393 return 0;
396 #define REFCOL_WIDTH 10
398 static int update_local_ref(struct ref *ref,
399 const char *remote,
400 const struct ref *remote_ref,
401 struct strbuf *display)
403 struct commit *current = NULL, *updated;
404 enum object_type type;
405 struct branch *current_branch = branch_get(NULL);
406 const char *pretty_ref = prettify_refname(ref->name);
408 type = sha1_object_info(ref->new_sha1, NULL);
409 if (type < 0)
410 die(_("object %s not found"), sha1_to_hex(ref->new_sha1));
412 if (!hashcmp(ref->old_sha1, ref->new_sha1)) {
413 if (verbosity > 0)
414 strbuf_addf(display, "= %-*s %-*s -> %s",
415 TRANSPORT_SUMMARY(_("[up to date]")),
416 REFCOL_WIDTH, remote, pretty_ref);
417 return 0;
420 if (current_branch &&
421 !strcmp(ref->name, current_branch->name) &&
422 !(update_head_ok || is_bare_repository()) &&
423 !is_null_sha1(ref->old_sha1)) {
425 * If this is the head, and it's not okay to update
426 * the head, and the old value of the head isn't empty...
428 strbuf_addf(display,
429 _("! %-*s %-*s -> %s (can't fetch in current branch)"),
430 TRANSPORT_SUMMARY(_("[rejected]")),
431 REFCOL_WIDTH, remote, pretty_ref);
432 return 1;
435 if (!is_null_sha1(ref->old_sha1) &&
436 !prefixcmp(ref->name, "refs/tags/")) {
437 int r;
438 r = s_update_ref("updating tag", ref, 0);
439 strbuf_addf(display, "%c %-*s %-*s -> %s%s",
440 r ? '!' : '-',
441 TRANSPORT_SUMMARY(_("[tag update]")),
442 REFCOL_WIDTH, remote, pretty_ref,
443 r ? _(" (unable to update local ref)") : "");
444 return r;
447 current = lookup_commit_reference_gently(ref->old_sha1, 1);
448 updated = lookup_commit_reference_gently(ref->new_sha1, 1);
449 if (!current || !updated) {
450 const char *msg;
451 const char *what;
452 int r;
454 * Nicely describe the new ref we're fetching.
455 * Base this on the remote's ref name, as it's
456 * more likely to follow a standard layout.
458 const char *name = remote_ref ? remote_ref->name : "";
459 if (!prefixcmp(name, "refs/tags/")) {
460 msg = "storing tag";
461 what = _("[new tag]");
462 } else if (!prefixcmp(name, "refs/heads/")) {
463 msg = "storing head";
464 what = _("[new branch]");
465 } else {
466 msg = "storing ref";
467 what = _("[new ref]");
470 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
471 (recurse_submodules != RECURSE_SUBMODULES_ON))
472 check_for_new_submodule_commits(ref->new_sha1);
473 r = s_update_ref(msg, ref, 0);
474 strbuf_addf(display, "%c %-*s %-*s -> %s%s",
475 r ? '!' : '*',
476 TRANSPORT_SUMMARY(what),
477 REFCOL_WIDTH, remote, pretty_ref,
478 r ? _(" (unable to update local ref)") : "");
479 return r;
482 if (in_merge_bases(current, updated)) {
483 char quickref[83];
484 int r;
485 strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV));
486 strcat(quickref, "..");
487 strcat(quickref, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV));
488 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
489 (recurse_submodules != RECURSE_SUBMODULES_ON))
490 check_for_new_submodule_commits(ref->new_sha1);
491 r = s_update_ref("fast-forward", ref, 1);
492 strbuf_addf(display, "%c %-*s %-*s -> %s%s",
493 r ? '!' : ' ',
494 TRANSPORT_SUMMARY_WIDTH, quickref,
495 REFCOL_WIDTH, remote, pretty_ref,
496 r ? _(" (unable to update local ref)") : "");
497 return r;
498 } else if (force || ref->force) {
499 char quickref[84];
500 int r;
501 strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV));
502 strcat(quickref, "...");
503 strcat(quickref, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV));
504 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
505 (recurse_submodules != RECURSE_SUBMODULES_ON))
506 check_for_new_submodule_commits(ref->new_sha1);
507 r = s_update_ref("forced-update", ref, 1);
508 strbuf_addf(display, "%c %-*s %-*s -> %s (%s)",
509 r ? '!' : '+',
510 TRANSPORT_SUMMARY_WIDTH, quickref,
511 REFCOL_WIDTH, remote, pretty_ref,
512 r ? _("unable to update local ref") : _("forced update"));
513 return r;
514 } else {
515 strbuf_addf(display, "! %-*s %-*s -> %s %s",
516 TRANSPORT_SUMMARY(_("[rejected]")),
517 REFCOL_WIDTH, remote, pretty_ref,
518 _("(non-fast-forward)"));
519 return 1;
523 static int iterate_ref_map(void *cb_data, unsigned char sha1[20])
525 struct ref **rm = cb_data;
526 struct ref *ref = *rm;
528 if (!ref)
529 return -1; /* end of the list */
530 *rm = ref->next;
531 hashcpy(sha1, ref->old_sha1);
532 return 0;
535 static int store_updated_refs(const char *raw_url, const char *remote_name,
536 struct ref *ref_map)
538 FILE *fp;
539 struct commit *commit;
540 int url_len, i, shown_url = 0, rc = 0;
541 struct strbuf note = STRBUF_INIT;
542 const char *what, *kind;
543 struct ref *rm;
544 char *url, *filename = dry_run ? "/dev/null" : git_path("FETCH_HEAD");
545 int want_status;
547 fp = fopen(filename, "a");
548 if (!fp)
549 return error(_("cannot open %s: %s\n"), filename, strerror(errno));
551 if (raw_url)
552 url = transport_anonymize_url(raw_url);
553 else
554 url = xstrdup("foreign");
556 rm = ref_map;
557 if (check_everything_connected(iterate_ref_map, 0, &rm)) {
558 rc = error(_("%s did not send all necessary objects\n"), url);
559 goto abort;
563 * We do a pass for each fetch_head_status type in their enum order, so
564 * merged entries are written before not-for-merge. That lets readers
565 * use FETCH_HEAD as a refname to refer to the ref to be merged.
567 for (want_status = FETCH_HEAD_MERGE;
568 want_status <= FETCH_HEAD_IGNORE;
569 want_status++) {
570 for (rm = ref_map; rm; rm = rm->next) {
571 struct ref *ref = NULL;
572 const char *merge_status_marker = "";
574 commit = lookup_commit_reference_gently(rm->old_sha1, 1);
575 if (!commit)
576 rm->fetch_head_status = FETCH_HEAD_NOT_FOR_MERGE;
578 if (rm->fetch_head_status != want_status)
579 continue;
581 if (rm->peer_ref) {
582 ref = xcalloc(1, sizeof(*ref) + strlen(rm->peer_ref->name) + 1);
583 strcpy(ref->name, rm->peer_ref->name);
584 hashcpy(ref->old_sha1, rm->peer_ref->old_sha1);
585 hashcpy(ref->new_sha1, rm->old_sha1);
586 ref->force = rm->peer_ref->force;
590 if (!strcmp(rm->name, "HEAD")) {
591 kind = "";
592 what = "";
594 else if (!prefixcmp(rm->name, "refs/heads/")) {
595 kind = "branch";
596 what = rm->name + 11;
598 else if (!prefixcmp(rm->name, "refs/tags/")) {
599 kind = "tag";
600 what = rm->name + 10;
602 else if (!prefixcmp(rm->name, "refs/remotes/")) {
603 kind = "remote-tracking branch";
604 what = rm->name + 13;
606 else {
607 kind = "";
608 what = rm->name;
611 url_len = strlen(url);
612 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
614 url_len = i + 1;
615 if (4 < i && !strncmp(".git", url + i - 3, 4))
616 url_len = i - 3;
618 strbuf_reset(&note);
619 if (*what) {
620 if (*kind)
621 strbuf_addf(&note, "%s ", kind);
622 strbuf_addf(&note, "'%s' of ", what);
624 switch (rm->fetch_head_status) {
625 case FETCH_HEAD_NOT_FOR_MERGE:
626 merge_status_marker = "not-for-merge";
627 /* fall-through */
628 case FETCH_HEAD_MERGE:
629 fprintf(fp, "%s\t%s\t%s",
630 sha1_to_hex(rm->old_sha1),
631 merge_status_marker,
632 note.buf);
633 for (i = 0; i < url_len; ++i)
634 if ('\n' == url[i])
635 fputs("\\n", fp);
636 else
637 fputc(url[i], fp);
638 fputc('\n', fp);
639 break;
640 default:
641 /* do not write anything to FETCH_HEAD */
642 break;
645 strbuf_reset(&note);
646 if (ref) {
647 rc |= update_local_ref(ref, what, rm, &note);
648 free(ref);
649 } else
650 strbuf_addf(&note, "* %-*s %-*s -> FETCH_HEAD",
651 TRANSPORT_SUMMARY_WIDTH,
652 *kind ? kind : "branch",
653 REFCOL_WIDTH,
654 *what ? what : "HEAD");
655 if (note.len) {
656 if (verbosity >= 0 && !shown_url) {
657 fprintf(stderr, _("From %.*s\n"),
658 url_len, url);
659 shown_url = 1;
661 if (verbosity >= 0)
662 fprintf(stderr, " %s\n", note.buf);
667 if (rc & STORE_REF_ERROR_DF_CONFLICT)
668 error(_("some local refs could not be updated; try running\n"
669 " 'git remote prune %s' to remove any old, conflicting "
670 "branches"), remote_name);
672 abort:
673 strbuf_release(&note);
674 free(url);
675 fclose(fp);
676 return rc;
680 * We would want to bypass the object transfer altogether if
681 * everything we are going to fetch already exists and is connected
682 * locally.
684 static int quickfetch(struct ref *ref_map)
686 struct ref *rm = ref_map;
689 * If we are deepening a shallow clone we already have these
690 * objects reachable. Running rev-list here will return with
691 * a good (0) exit status and we'll bypass the fetch that we
692 * really need to perform. Claiming failure now will ensure
693 * we perform the network exchange to deepen our history.
695 if (depth)
696 return -1;
697 return check_everything_connected(iterate_ref_map, 1, &rm);
700 static int fetch_refs(struct transport *transport, struct ref *ref_map)
702 int ret = quickfetch(ref_map);
703 if (ret)
704 ret = transport_fetch_refs(transport, ref_map);
705 if (!ret)
706 ret |= store_updated_refs(transport->url,
707 transport->remote->name,
708 ref_map);
709 transport_unlock_pack(transport);
710 return ret;
713 static int prune_refs(struct refspec *refs, int ref_count, struct ref *ref_map)
715 int result = 0;
716 struct ref *ref, *stale_refs = get_stale_heads(refs, ref_count, ref_map);
717 const char *dangling_msg = dry_run
718 ? _(" (%s will become dangling)")
719 : _(" (%s has become dangling)");
721 for (ref = stale_refs; ref; ref = ref->next) {
722 if (!dry_run)
723 result |= delete_ref(ref->name, NULL, 0);
724 if (verbosity >= 0) {
725 fprintf(stderr, " x %-*s %-*s -> %s\n",
726 TRANSPORT_SUMMARY(_("[deleted]")),
727 REFCOL_WIDTH, _("(none)"), prettify_refname(ref->name));
728 warn_dangling_symref(stderr, dangling_msg, ref->name);
731 free_refs(stale_refs);
732 return result;
735 static void check_not_current_branch(struct ref *ref_map)
737 struct branch *current_branch = branch_get(NULL);
739 if (is_bare_repository() || !current_branch)
740 return;
742 for (; ref_map; ref_map = ref_map->next)
743 if (ref_map->peer_ref && !strcmp(current_branch->refname,
744 ref_map->peer_ref->name))
745 die(_("Refusing to fetch into current branch %s "
746 "of non-bare repository"), current_branch->refname);
749 static int truncate_fetch_head(void)
751 char *filename = git_path("FETCH_HEAD");
752 FILE *fp = fopen(filename, "w");
754 if (!fp)
755 return error(_("cannot open %s: %s\n"), filename, strerror(errno));
756 fclose(fp);
757 return 0;
760 static void set_option(struct transport *transport, const char *name, const char *value)
762 int r = transport_set_option(transport, name, value);
763 if (r < 0)
764 die(_("Option \"%s\" value \"%s\" is not valid for %s"),
765 name, value, transport->url);
766 if (r > 0)
767 warning(_("Option \"%s\" is ignored for %s\n"),
768 name, transport->url);
771 static struct transport *prepare_transport(struct remote *remote)
773 struct transport *transport;
774 transport = transport_get(remote, NULL);
775 transport_set_verbosity(transport, verbosity, progress);
776 if (upload_pack)
777 set_option(transport, TRANS_OPT_UPLOADPACK, upload_pack);
778 if (keep)
779 set_option(transport, TRANS_OPT_KEEP, "yes");
780 if (depth)
781 set_option(transport, TRANS_OPT_DEPTH, depth);
782 return transport;
785 static void backfill_tags(struct transport *transport, struct ref *ref_map)
787 if (transport->cannot_reuse) {
788 gsecondary = prepare_transport(transport->remote);
789 transport = gsecondary;
792 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
793 transport_set_option(transport, TRANS_OPT_DEPTH, "0");
794 fetch_refs(transport, ref_map);
796 if (gsecondary) {
797 transport_disconnect(gsecondary);
798 gsecondary = NULL;
802 static int do_fetch(struct transport *transport,
803 struct refspec *refs, int ref_count)
805 struct string_list existing_refs = STRING_LIST_INIT_DUP;
806 struct ref *ref_map;
807 struct ref *rm;
808 int autotags = (transport->remote->fetch_tags == 1);
809 int retcode = 0;
811 for_each_ref(add_existing, &existing_refs);
813 if (tags == TAGS_DEFAULT) {
814 if (transport->remote->fetch_tags == 2)
815 tags = TAGS_SET;
816 if (transport->remote->fetch_tags == -1)
817 tags = TAGS_UNSET;
820 if (!transport->get_refs_list || !transport->fetch)
821 die(_("Don't know how to fetch from %s"), transport->url);
823 /* if not appending, truncate FETCH_HEAD */
824 if (!append && !dry_run) {
825 retcode = truncate_fetch_head();
826 if (retcode)
827 goto cleanup;
830 ref_map = get_ref_map(transport, refs, ref_count, tags, &autotags);
831 if (!update_head_ok)
832 check_not_current_branch(ref_map);
834 for (rm = ref_map; rm; rm = rm->next) {
835 if (rm->peer_ref) {
836 struct string_list_item *peer_item =
837 string_list_lookup(&existing_refs,
838 rm->peer_ref->name);
839 if (peer_item)
840 hashcpy(rm->peer_ref->old_sha1,
841 peer_item->util);
845 if (tags == TAGS_DEFAULT && autotags)
846 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
847 if (fetch_refs(transport, ref_map)) {
848 free_refs(ref_map);
849 retcode = 1;
850 goto cleanup;
852 if (prune) {
853 struct refspec *prune_refspecs;
854 int prune_refspec_count;
856 if (ref_count) {
857 prune_refspecs = refs;
858 prune_refspec_count = ref_count;
859 } else {
860 prune_refspecs = transport->remote->fetch;
861 prune_refspec_count = transport->remote->fetch_refspec_nr;
864 if (tags == TAGS_SET) {
866 * --tags was specified. Pretend that the user also
867 * gave us the canonical tags refspec
869 const char *tags_str = "refs/tags/*:refs/tags/*";
870 struct refspec *tags_refspec, *refspec;
872 /* Copy the refspec and add the tags to it */
873 refspec = xcalloc(prune_refspec_count + 1, sizeof(*refspec));
874 tags_refspec = parse_fetch_refspec(1, &tags_str);
875 memcpy(refspec, prune_refspecs, prune_refspec_count * sizeof(*refspec));
876 memcpy(&refspec[prune_refspec_count], tags_refspec, sizeof(*refspec));
878 prune_refs(refspec, prune_refspec_count + 1, ref_map);
880 /* The rest of the strings belong to fetch_one */
881 free_refspec(1, tags_refspec);
882 free(refspec);
883 } else {
884 prune_refs(prune_refspecs, prune_refspec_count, ref_map);
887 free_refs(ref_map);
889 /* if neither --no-tags nor --tags was specified, do automated tag
890 * following ... */
891 if (tags == TAGS_DEFAULT && autotags) {
892 struct ref **tail = &ref_map;
893 ref_map = NULL;
894 find_non_local_tags(transport, &ref_map, &tail);
895 if (ref_map)
896 backfill_tags(transport, ref_map);
897 free_refs(ref_map);
900 cleanup:
901 string_list_clear(&existing_refs, 1);
902 return retcode;
905 static int get_one_remote_for_fetch(struct remote *remote, void *priv)
907 struct string_list *list = priv;
908 if (!remote->skip_default_update)
909 string_list_append(list, remote->name);
910 return 0;
913 struct remote_group_data {
914 const char *name;
915 struct string_list *list;
918 static int get_remote_group(const char *key, const char *value, void *priv)
920 struct remote_group_data *g = priv;
922 if (!prefixcmp(key, "remotes.") &&
923 !strcmp(key + 8, g->name)) {
924 /* split list by white space */
925 int space = strcspn(value, " \t\n");
926 while (*value) {
927 if (space > 1) {
928 string_list_append(g->list,
929 xstrndup(value, space));
931 value += space + (value[space] != '\0');
932 space = strcspn(value, " \t\n");
936 return 0;
939 static int add_remote_or_group(const char *name, struct string_list *list)
941 int prev_nr = list->nr;
942 struct remote_group_data g;
943 g.name = name; g.list = list;
945 git_config(get_remote_group, &g);
946 if (list->nr == prev_nr) {
947 struct remote *remote;
948 if (!remote_is_configured(name))
949 return 0;
950 remote = remote_get(name);
951 string_list_append(list, remote->name);
953 return 1;
956 static void add_options_to_argv(struct argv_array *argv)
958 if (dry_run)
959 argv_array_push(argv, "--dry-run");
960 if (prune > 0)
961 argv_array_push(argv, "--prune");
962 if (update_head_ok)
963 argv_array_push(argv, "--update-head-ok");
964 if (force)
965 argv_array_push(argv, "--force");
966 if (keep)
967 argv_array_push(argv, "--keep");
968 if (recurse_submodules == RECURSE_SUBMODULES_ON)
969 argv_array_push(argv, "--recurse-submodules");
970 else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND)
971 argv_array_push(argv, "--recurse-submodules=on-demand");
972 if (tags == TAGS_SET)
973 argv_array_push(argv, "--tags");
974 else if (tags == TAGS_UNSET)
975 argv_array_push(argv, "--no-tags");
976 if (verbosity >= 2)
977 argv_array_push(argv, "-v");
978 if (verbosity >= 1)
979 argv_array_push(argv, "-v");
980 else if (verbosity < 0)
981 argv_array_push(argv, "-q");
985 static int fetch_multiple(struct string_list *list)
987 int i, result = 0;
988 struct argv_array argv = ARGV_ARRAY_INIT;
990 if (!append && !dry_run) {
991 int errcode = truncate_fetch_head();
992 if (errcode)
993 return errcode;
996 argv_array_pushl(&argv, "fetch", "--append", NULL);
997 add_options_to_argv(&argv);
999 for (i = 0; i < list->nr; i++) {
1000 const char *name = list->items[i].string;
1001 argv_array_push(&argv, name);
1002 if (verbosity >= 0)
1003 printf(_("Fetching %s\n"), name);
1004 if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
1005 error(_("Could not fetch %s"), name);
1006 result = 1;
1008 argv_array_pop(&argv);
1011 argv_array_clear(&argv);
1012 return result;
1015 static int fetch_one(struct remote *remote, int argc, const char **argv)
1017 int i;
1018 static const char **refs = NULL;
1019 struct refspec *refspec;
1020 int ref_nr = 0;
1021 int exit_code;
1023 if (!remote)
1024 die(_("No remote repository specified. Please, specify either a URL or a\n"
1025 "remote name from which new revisions should be fetched."));
1027 gtransport = prepare_transport(remote);
1029 if (prune < 0) {
1030 /* no command line request */
1031 if (0 <= gtransport->remote->prune)
1032 prune = gtransport->remote->prune;
1033 else if (0 <= fetch_prune_config)
1034 prune = fetch_prune_config;
1035 else
1036 prune = PRUNE_BY_DEFAULT;
1039 if (argc > 0) {
1040 int j = 0;
1041 refs = xcalloc(argc + 1, sizeof(const char *));
1042 for (i = 0; i < argc; i++) {
1043 if (!strcmp(argv[i], "tag")) {
1044 char *ref;
1045 i++;
1046 if (i >= argc)
1047 die(_("You need to specify a tag name."));
1048 ref = xmalloc(strlen(argv[i]) * 2 + 22);
1049 strcpy(ref, "refs/tags/");
1050 strcat(ref, argv[i]);
1051 strcat(ref, ":refs/tags/");
1052 strcat(ref, argv[i]);
1053 refs[j++] = ref;
1054 } else
1055 refs[j++] = argv[i];
1057 refs[j] = NULL;
1058 ref_nr = j;
1061 sigchain_push_common(unlock_pack_on_signal);
1062 atexit(unlock_pack);
1063 refspec = parse_fetch_refspec(ref_nr, refs);
1064 exit_code = do_fetch(gtransport, refspec, ref_nr);
1065 free_refspec(ref_nr, refspec);
1066 transport_disconnect(gtransport);
1067 gtransport = NULL;
1068 return exit_code;
1071 int cmd_fetch(int argc, const char **argv, const char *prefix)
1073 int i;
1074 struct string_list list = STRING_LIST_INIT_NODUP;
1075 struct remote *remote;
1076 int result = 0;
1077 static const char *argv_gc_auto[] = {
1078 "gc", "--auto", NULL,
1081 packet_trace_identity("fetch");
1083 /* Record the command line for the reflog */
1084 strbuf_addstr(&default_rla, "fetch");
1085 for (i = 1; i < argc; i++)
1086 strbuf_addf(&default_rla, " %s", argv[i]);
1088 git_config(git_fetch_config, NULL);
1090 argc = parse_options(argc, argv, prefix,
1091 builtin_fetch_options, builtin_fetch_usage, 0);
1093 if (unshallow) {
1094 if (depth)
1095 die(_("--depth and --unshallow cannot be used together"));
1096 else if (!is_repository_shallow())
1097 die(_("--unshallow on a complete repository does not make sense"));
1098 else {
1099 static char inf_depth[12];
1100 sprintf(inf_depth, "%d", INFINITE_DEPTH);
1101 depth = inf_depth;
1105 if (recurse_submodules != RECURSE_SUBMODULES_OFF) {
1106 if (recurse_submodules_default) {
1107 int arg = parse_fetch_recurse_submodules_arg("--recurse-submodules-default", recurse_submodules_default);
1108 set_config_fetch_recurse_submodules(arg);
1110 gitmodules_config();
1111 git_config(submodule_config, NULL);
1114 if (all) {
1115 if (argc == 1)
1116 die(_("fetch --all does not take a repository argument"));
1117 else if (argc > 1)
1118 die(_("fetch --all does not make sense with refspecs"));
1119 (void) for_each_remote(get_one_remote_for_fetch, &list);
1120 result = fetch_multiple(&list);
1121 } else if (argc == 0) {
1122 /* No arguments -- use default remote */
1123 remote = remote_get(NULL);
1124 result = fetch_one(remote, argc, argv);
1125 } else if (multiple) {
1126 /* All arguments are assumed to be remotes or groups */
1127 for (i = 0; i < argc; i++)
1128 if (!add_remote_or_group(argv[i], &list))
1129 die(_("No such remote or remote group: %s"), argv[i]);
1130 result = fetch_multiple(&list);
1131 } else {
1132 /* Single remote or group */
1133 (void) add_remote_or_group(argv[0], &list);
1134 if (list.nr > 1) {
1135 /* More than one remote */
1136 if (argc > 1)
1137 die(_("Fetching a group and specifying refspecs does not make sense"));
1138 result = fetch_multiple(&list);
1139 } else {
1140 /* Zero or one remotes */
1141 remote = remote_get(argv[0]);
1142 result = fetch_one(remote, argc-1, argv+1);
1146 if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
1147 struct argv_array options = ARGV_ARRAY_INIT;
1149 add_options_to_argv(&options);
1150 result = fetch_populated_submodules(&options,
1151 submodule_prefix,
1152 recurse_submodules,
1153 verbosity < 0);
1154 argv_array_clear(&options);
1157 /* All names were strdup()ed or strndup()ed */
1158 list.strdup_strings = 1;
1159 string_list_clear(&list, 0);
1161 run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
1163 return result;