6 #include "repository.h"
9 #include "object-store.h"
12 #include "string-list.h"
14 #include "transport.h"
15 #include "run-command.h"
16 #include "parse-options.h"
18 #include "submodule-config.h"
19 #include "submodule.h"
20 #include "connected.h"
21 #include "argv-array.h"
24 #include "list-objects-filter-options.h"
25 #include "commit-reach.h"
27 static const char * const builtin_fetch_usage[] = {
28 N_("git fetch [<options>] [<repository> [<refspec>...]]"),
29 N_("git fetch [<options>] <group>"),
30 N_("git fetch --multiple [<options>] [(<repository> | <group>)...]"),
31 N_("git fetch --all [<options>]"),
41 static int fetch_prune_config = -1; /* unspecified */
42 static int prune = -1; /* unspecified */
43 #define PRUNE_BY_DEFAULT 0 /* do we prune by default? */
45 static int fetch_prune_tags_config = -1; /* unspecified */
46 static int prune_tags = -1; /* unspecified */
47 #define PRUNE_TAGS_BY_DEFAULT 0 /* do we prune tags by default? */
49 static int all, append, dry_run, force, keep, multiple, update_head_ok, verbosity, deepen_relative;
50 static int progress = -1;
51 static int tags = TAGS_DEFAULT, unshallow, update_shallow, deepen;
52 static int max_children = 1;
53 static enum transport_family family;
54 static const char *depth;
55 static const char *deepen_since;
56 static const char *upload_pack;
57 static struct string_list deepen_not = STRING_LIST_INIT_NODUP;
58 static struct strbuf default_rla = STRBUF_INIT;
59 static struct transport *gtransport;
60 static struct transport *gsecondary;
61 static const char *submodule_prefix = "";
62 static int recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
63 static int recurse_submodules_default = RECURSE_SUBMODULES_ON_DEMAND;
64 static int shown_url = 0;
65 static struct refspec refmap = REFSPEC_INIT_FETCH;
66 static struct list_objects_filter_options filter_options;
67 static struct string_list server_options = STRING_LIST_INIT_DUP;
68 static struct string_list negotiation_tip = STRING_LIST_INIT_NODUP;
70 static int git_fetch_config(const char *k, const char *v, void *cb)
72 if (!strcmp(k, "fetch.prune")) {
73 fetch_prune_config = git_config_bool(k, v);
77 if (!strcmp(k, "fetch.prunetags")) {
78 fetch_prune_tags_config = git_config_bool(k, v);
82 if (!strcmp(k, "submodule.recurse")) {
83 int r = git_config_bool(k, v) ?
84 RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;
85 recurse_submodules = r;
88 if (!strcmp(k, "submodule.fetchjobs")) {
89 max_children = parse_submodule_fetchjobs(k, v);
91 } else if (!strcmp(k, "fetch.recursesubmodules")) {
92 recurse_submodules = parse_fetch_recurse_submodules_arg(k, v);
96 return git_default_config(k, v, cb);
99 static int parse_refmap_arg(const struct option *opt, const char *arg, int unset)
101 BUG_ON_OPT_NEG(unset);
104 * "git fetch --refmap='' origin foo"
105 * can be used to tell the command not to store anywhere
107 refspec_append(&refmap, arg);
112 static struct option builtin_fetch_options[] = {
113 OPT__VERBOSITY(&verbosity),
114 OPT_BOOL(0, "all", &all,
115 N_("fetch from all remotes")),
116 OPT_BOOL('a', "append", &append,
117 N_("append to .git/FETCH_HEAD instead of overwriting")),
118 OPT_STRING(0, "upload-pack", &upload_pack, N_("path"),
119 N_("path to upload pack on remote end")),
120 OPT__FORCE(&force, N_("force overwrite of local reference"), 0),
121 OPT_BOOL('m', "multiple", &multiple,
122 N_("fetch from multiple remotes")),
123 OPT_SET_INT('t', "tags", &tags,
124 N_("fetch all tags and associated objects"), TAGS_SET),
125 OPT_SET_INT('n', NULL, &tags,
126 N_("do not fetch all tags (--no-tags)"), TAGS_UNSET),
127 OPT_INTEGER('j', "jobs", &max_children,
128 N_("number of submodules fetched in parallel")),
129 OPT_BOOL('p', "prune", &prune,
130 N_("prune remote-tracking branches no longer on remote")),
131 OPT_BOOL('P', "prune-tags", &prune_tags,
132 N_("prune local tags no longer on remote and clobber changed tags")),
133 { OPTION_CALLBACK, 0, "recurse-submodules", &recurse_submodules, N_("on-demand"),
134 N_("control recursive fetching of submodules"),
135 PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules },
136 OPT_BOOL(0, "dry-run", &dry_run,
138 OPT_BOOL('k', "keep", &keep, N_("keep downloaded pack")),
139 OPT_BOOL('u', "update-head-ok", &update_head_ok,
140 N_("allow updating of HEAD ref")),
141 OPT_BOOL(0, "progress", &progress, N_("force progress reporting")),
142 OPT_STRING(0, "depth", &depth, N_("depth"),
143 N_("deepen history of shallow clone")),
144 OPT_STRING(0, "shallow-since", &deepen_since, N_("time"),
145 N_("deepen history of shallow repository based on time")),
146 OPT_STRING_LIST(0, "shallow-exclude", &deepen_not, N_("revision"),
147 N_("deepen history of shallow clone, excluding rev")),
148 OPT_INTEGER(0, "deepen", &deepen_relative,
149 N_("deepen history of shallow clone")),
150 OPT_SET_INT_F(0, "unshallow", &unshallow,
151 N_("convert to a complete repository"),
153 { OPTION_STRING, 0, "submodule-prefix", &submodule_prefix, N_("dir"),
154 N_("prepend this to submodule path output"), PARSE_OPT_HIDDEN },
155 { OPTION_CALLBACK, 0, "recurse-submodules-default",
156 &recurse_submodules_default, N_("on-demand"),
157 N_("default for recursive fetching of submodules "
158 "(lower priority than config files)"),
159 PARSE_OPT_HIDDEN, option_fetch_parse_recurse_submodules },
160 OPT_BOOL(0, "update-shallow", &update_shallow,
161 N_("accept refs that update .git/shallow")),
162 { OPTION_CALLBACK, 0, "refmap", NULL, N_("refmap"),
163 N_("specify fetch refmap"), PARSE_OPT_NONEG, parse_refmap_arg },
164 OPT_STRING_LIST('o', "server-option", &server_options, N_("server-specific"), N_("option to transmit")),
165 OPT_SET_INT('4', "ipv4", &family, N_("use IPv4 addresses only"),
166 TRANSPORT_FAMILY_IPV4),
167 OPT_SET_INT('6', "ipv6", &family, N_("use IPv6 addresses only"),
168 TRANSPORT_FAMILY_IPV6),
169 OPT_STRING_LIST(0, "negotiation-tip", &negotiation_tip, N_("revision"),
170 N_("report that we have only objects reachable from this object")),
171 OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options),
175 static void unlock_pack(void)
178 transport_unlock_pack(gtransport);
180 transport_unlock_pack(gsecondary);
183 static void unlock_pack_on_signal(int signo)
190 static void add_merge_config(struct ref **head,
191 const struct ref *remote_refs,
192 struct branch *branch,
197 for (i = 0; i < branch->merge_nr; i++) {
198 struct ref *rm, **old_tail = *tail;
199 struct refspec_item refspec;
201 for (rm = *head; rm; rm = rm->next) {
202 if (branch_merge_matches(branch, i, rm->name)) {
203 rm->fetch_head_status = FETCH_HEAD_MERGE;
211 * Not fetched to a remote-tracking branch? We need to fetch
212 * it anyway to allow this branch's "branch.$name.merge"
213 * to be honored by 'git pull', but we do not have to
214 * fail if branch.$name.merge is misconfigured to point
215 * at a nonexisting branch. If we were indeed called by
216 * 'git pull', it will notice the misconfiguration because
217 * there is no entry in the resulting FETCH_HEAD marked
220 memset(&refspec, 0, sizeof(refspec));
221 refspec.src = branch->merge[i]->src;
222 get_fetch_map(remote_refs, &refspec, tail, 1);
223 for (rm = *old_tail; rm; rm = rm->next)
224 rm->fetch_head_status = FETCH_HEAD_MERGE;
228 static int will_fetch(struct ref **head, const unsigned char *sha1)
230 struct ref *rm = *head;
232 if (hasheq(rm->old_oid.hash, sha1))
239 struct refname_hash_entry {
240 struct hashmap_entry ent; /* must be the first member */
241 struct object_id oid;
243 char refname[FLEX_ARRAY];
246 static int refname_hash_entry_cmp(const void *hashmap_cmp_fn_data,
251 const struct refname_hash_entry *e1 = e1_;
252 const struct refname_hash_entry *e2 = e2_;
254 return strcmp(e1->refname, keydata ? keydata : e2->refname);
257 static struct refname_hash_entry *refname_hash_add(struct hashmap *map,
259 const struct object_id *oid)
261 struct refname_hash_entry *ent;
262 size_t len = strlen(refname);
264 FLEX_ALLOC_MEM(ent, refname, refname, len);
265 hashmap_entry_init(ent, strhash(refname));
266 oidcpy(&ent->oid, oid);
267 hashmap_add(map, ent);
271 static int add_one_refname(const char *refname,
272 const struct object_id *oid,
273 int flag, void *cbdata)
275 struct hashmap *refname_map = cbdata;
277 (void) refname_hash_add(refname_map, refname, oid);
281 static void refname_hash_init(struct hashmap *map)
283 hashmap_init(map, refname_hash_entry_cmp, NULL, 0);
286 static int refname_hash_exists(struct hashmap *map, const char *refname)
288 return !!hashmap_get_from_hash(map, strhash(refname), refname);
291 static void clear_item(struct refname_hash_entry *item)
296 static void find_non_local_tags(const struct ref *refs,
300 struct hashmap existing_refs;
301 struct hashmap remote_refs;
302 struct string_list remote_refs_list = STRING_LIST_INIT_NODUP;
303 struct string_list_item *remote_ref_item;
304 const struct ref *ref;
305 struct refname_hash_entry *item = NULL;
307 refname_hash_init(&existing_refs);
308 refname_hash_init(&remote_refs);
310 for_each_ref(add_one_refname, &existing_refs);
311 for (ref = refs; ref; ref = ref->next) {
312 if (!starts_with(ref->name, "refs/tags/"))
316 * The peeled ref always follows the matching base
317 * ref, so if we see a peeled ref that we don't want
318 * to fetch then we can mark the ref entry in the list
319 * as one to ignore by setting util to NULL.
321 if (ends_with(ref->name, "^{}")) {
323 !has_object_file_with_flags(&ref->old_oid,
324 OBJECT_INFO_QUICK) &&
325 !will_fetch(head, ref->old_oid.hash) &&
326 !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) &&
327 !will_fetch(head, item->oid.hash))
334 * If item is non-NULL here, then we previously saw a
335 * ref not followed by a peeled reference, so we need
336 * to check if it is a lightweight tag that we want to
340 !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) &&
341 !will_fetch(head, item->oid.hash))
346 /* skip duplicates and refs that we already have */
347 if (refname_hash_exists(&remote_refs, ref->name) ||
348 refname_hash_exists(&existing_refs, ref->name))
351 item = refname_hash_add(&remote_refs, ref->name, &ref->old_oid);
352 string_list_insert(&remote_refs_list, ref->name);
354 hashmap_free(&existing_refs, 1);
357 * We may have a final lightweight tag that needs to be
358 * checked to see if it needs fetching.
361 !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) &&
362 !will_fetch(head, item->oid.hash))
366 * For all the tags in the remote_refs_list,
367 * add them to the list of refs to be fetched
369 for_each_string_list_item(remote_ref_item, &remote_refs_list) {
370 const char *refname = remote_ref_item->string;
373 item = hashmap_get_from_hash(&remote_refs, strhash(refname), refname);
375 BUG("unseen remote ref?");
377 /* Unless we have already decided to ignore this item... */
381 rm = alloc_ref(item->refname);
382 rm->peer_ref = alloc_ref(item->refname);
383 oidcpy(&rm->old_oid, &item->oid);
387 hashmap_free(&remote_refs, 1);
388 string_list_clear(&remote_refs_list, 0);
391 static struct ref *get_ref_map(struct remote *remote,
392 const struct ref *remote_refs,
394 int tags, int *autotags)
398 struct ref *ref_map = NULL;
399 struct ref **tail = &ref_map;
401 /* opportunistically-updated references: */
402 struct ref *orefs = NULL, **oref_tail = &orefs;
404 struct hashmap existing_refs;
407 struct refspec *fetch_refspec;
409 for (i = 0; i < rs->nr; i++) {
410 get_fetch_map(remote_refs, &rs->items[i], &tail, 0);
411 if (rs->items[i].dst && rs->items[i].dst[0])
414 /* Merge everything on the command line (but not --tags) */
415 for (rm = ref_map; rm; rm = rm->next)
416 rm->fetch_head_status = FETCH_HEAD_MERGE;
419 * For any refs that we happen to be fetching via
420 * command-line arguments, the destination ref might
421 * have been missing or have been different than the
422 * remote-tracking ref that would be derived from the
423 * configured refspec. In these cases, we want to
424 * take the opportunity to update their configured
425 * remote-tracking reference. However, we do not want
426 * to mention these entries in FETCH_HEAD at all, as
427 * they would simply be duplicates of existing
428 * entries, so we set them FETCH_HEAD_IGNORE below.
430 * We compute these entries now, based only on the
431 * refspecs specified on the command line. But we add
432 * them to the list following the refspecs resulting
433 * from the tags option so that one of the latter,
434 * which has FETCH_HEAD_NOT_FOR_MERGE, is not removed
435 * by ref_remove_duplicates() in favor of one of these
436 * opportunistic entries with FETCH_HEAD_IGNORE.
439 fetch_refspec = &refmap;
441 fetch_refspec = &remote->fetch;
443 for (i = 0; i < fetch_refspec->nr; i++)
444 get_fetch_map(ref_map, &fetch_refspec->items[i], &oref_tail, 1);
445 } else if (refmap.nr) {
446 die("--refmap option is only meaningful with command-line refspec(s).");
448 /* Use the defaults */
449 struct branch *branch = branch_get(NULL);
450 int has_merge = branch_has_merge_config(branch);
453 /* Note: has_merge implies non-NULL branch->remote_name */
454 (has_merge && !strcmp(branch->remote_name, remote->name)))) {
455 for (i = 0; i < remote->fetch.nr; i++) {
456 get_fetch_map(remote_refs, &remote->fetch.items[i], &tail, 0);
457 if (remote->fetch.items[i].dst &&
458 remote->fetch.items[i].dst[0])
460 if (!i && !has_merge && ref_map &&
461 !remote->fetch.items[0].pattern)
462 ref_map->fetch_head_status = FETCH_HEAD_MERGE;
465 * if the remote we're fetching from is the same
466 * as given in branch.<name>.remote, we add the
467 * ref given in branch.<name>.merge, too.
469 * Note: has_merge implies non-NULL branch->remote_name
472 !strcmp(branch->remote_name, remote->name))
473 add_merge_config(&ref_map, remote_refs, branch, &tail);
475 ref_map = get_remote_ref(remote_refs, "HEAD");
477 die(_("Couldn't find remote ref HEAD"));
478 ref_map->fetch_head_status = FETCH_HEAD_MERGE;
479 tail = &ref_map->next;
483 if (tags == TAGS_SET)
484 /* also fetch all tags */
485 get_fetch_map(remote_refs, tag_refspec, &tail, 0);
486 else if (tags == TAGS_DEFAULT && *autotags)
487 find_non_local_tags(remote_refs, &ref_map, &tail);
489 /* Now append any refs to be updated opportunistically: */
491 for (rm = orefs; rm; rm = rm->next) {
492 rm->fetch_head_status = FETCH_HEAD_IGNORE;
496 ref_map = ref_remove_duplicates(ref_map);
498 refname_hash_init(&existing_refs);
499 for_each_ref(add_one_refname, &existing_refs);
501 for (rm = ref_map; rm; rm = rm->next) {
503 const char *refname = rm->peer_ref->name;
504 struct refname_hash_entry *peer_item;
506 peer_item = hashmap_get_from_hash(&existing_refs,
510 struct object_id *old_oid = &peer_item->oid;
511 oidcpy(&rm->peer_ref->old_oid, old_oid);
515 hashmap_free(&existing_refs, 1);
520 #define STORE_REF_ERROR_OTHER 1
521 #define STORE_REF_ERROR_DF_CONFLICT 2
523 static int s_update_ref(const char *action,
528 char *rla = getenv("GIT_REFLOG_ACTION");
529 struct ref_transaction *transaction;
530 struct strbuf err = STRBUF_INIT;
531 int ret, df_conflict = 0;
536 rla = default_rla.buf;
537 msg = xstrfmt("%s: %s", rla, action);
539 transaction = ref_transaction_begin(&err);
541 ref_transaction_update(transaction, ref->name,
543 check_old ? &ref->old_oid : NULL,
547 ret = ref_transaction_commit(transaction, &err);
549 df_conflict = (ret == TRANSACTION_NAME_CONFLICT);
553 ref_transaction_free(transaction);
554 strbuf_release(&err);
558 ref_transaction_free(transaction);
559 error("%s", err.buf);
560 strbuf_release(&err);
562 return df_conflict ? STORE_REF_ERROR_DF_CONFLICT
563 : STORE_REF_ERROR_OTHER;
566 static int refcol_width = 10;
567 static int compact_format;
569 static void adjust_refcol_width(const struct ref *ref)
571 int max, rlen, llen, len;
573 /* uptodate lines are only shown on high verbosity level */
574 if (!verbosity && oideq(&ref->peer_ref->old_oid, &ref->old_oid))
577 max = term_columns();
578 rlen = utf8_strwidth(prettify_refname(ref->name));
580 llen = utf8_strwidth(prettify_refname(ref->peer_ref->name));
583 * rough estimation to see if the output line is too long and
584 * should not be counted (we can't do precise calculation
585 * anyway because we don't know if the error explanation part
586 * will be printed in update_local_ref)
588 if (compact_format) {
592 len = 21 /* flag and summary */ + rlen + 4 /* -> */ + llen;
597 * Not precise calculation for compact mode because '*' can
598 * appear on the left hand side of '->' and shrink the column
601 if (refcol_width < rlen)
605 static void prepare_format_display(struct ref *ref_map)
608 const char *format = "full";
610 git_config_get_string_const("fetch.output", &format);
611 if (!strcasecmp(format, "full"))
613 else if (!strcasecmp(format, "compact"))
616 die(_("configuration fetch.output contains invalid value %s"),
619 for (rm = ref_map; rm; rm = rm->next) {
620 if (rm->status == REF_STATUS_REJECT_SHALLOW ||
622 !strcmp(rm->name, "HEAD"))
625 adjust_refcol_width(rm);
629 static void print_remote_to_local(struct strbuf *display,
630 const char *remote, const char *local)
632 strbuf_addf(display, "%-*s -> %s", refcol_width, remote, local);
635 static int find_and_replace(struct strbuf *haystack,
637 const char *placeholder)
639 const char *p = NULL;
642 nlen = strlen(needle);
643 if (ends_with(haystack->buf, needle))
644 p = haystack->buf + haystack->len - nlen;
646 p = strstr(haystack->buf, needle);
650 if (p > haystack->buf && p[-1] != '/')
654 if (plen > nlen && p[nlen] != '/')
657 strbuf_splice(haystack, p - haystack->buf, nlen,
658 placeholder, strlen(placeholder));
662 static void print_compact(struct strbuf *display,
663 const char *remote, const char *local)
665 struct strbuf r = STRBUF_INIT;
666 struct strbuf l = STRBUF_INIT;
668 if (!strcmp(remote, local)) {
669 strbuf_addf(display, "%-*s -> *", refcol_width, remote);
673 strbuf_addstr(&r, remote);
674 strbuf_addstr(&l, local);
676 if (!find_and_replace(&r, local, "*"))
677 find_and_replace(&l, remote, "*");
678 print_remote_to_local(display, r.buf, l.buf);
684 static void format_display(struct strbuf *display, char code,
685 const char *summary, const char *error,
686 const char *remote, const char *local,
689 int width = (summary_width + strlen(summary) - gettext_width(summary));
691 strbuf_addf(display, "%c %-*s ", code, width, summary);
693 print_remote_to_local(display, remote, local);
695 print_compact(display, remote, local);
697 strbuf_addf(display, " (%s)", error);
700 static int update_local_ref(struct ref *ref,
702 const struct ref *remote_ref,
703 struct strbuf *display,
706 struct commit *current = NULL, *updated;
707 enum object_type type;
708 struct branch *current_branch = branch_get(NULL);
709 const char *pretty_ref = prettify_refname(ref->name);
711 type = oid_object_info(the_repository, &ref->new_oid, NULL);
713 die(_("object %s not found"), oid_to_hex(&ref->new_oid));
715 if (oideq(&ref->old_oid, &ref->new_oid)) {
717 format_display(display, '=', _("[up to date]"), NULL,
718 remote, pretty_ref, summary_width);
722 if (current_branch &&
723 !strcmp(ref->name, current_branch->name) &&
724 !(update_head_ok || is_bare_repository()) &&
725 !is_null_oid(&ref->old_oid)) {
727 * If this is the head, and it's not okay to update
728 * the head, and the old value of the head isn't empty...
730 format_display(display, '!', _("[rejected]"),
731 _("can't fetch in current branch"),
732 remote, pretty_ref, summary_width);
736 if (!is_null_oid(&ref->old_oid) &&
737 starts_with(ref->name, "refs/tags/")) {
738 if (force || ref->force) {
740 r = s_update_ref("updating tag", ref, 0);
741 format_display(display, r ? '!' : 't', _("[tag update]"),
742 r ? _("unable to update local ref") : NULL,
743 remote, pretty_ref, summary_width);
746 format_display(display, '!', _("[rejected]"), _("would clobber existing tag"),
747 remote, pretty_ref, summary_width);
752 current = lookup_commit_reference_gently(the_repository,
754 updated = lookup_commit_reference_gently(the_repository,
756 if (!current || !updated) {
761 * Nicely describe the new ref we're fetching.
762 * Base this on the remote's ref name, as it's
763 * more likely to follow a standard layout.
765 const char *name = remote_ref ? remote_ref->name : "";
766 if (starts_with(name, "refs/tags/")) {
768 what = _("[new tag]");
769 } else if (starts_with(name, "refs/heads/")) {
770 msg = "storing head";
771 what = _("[new branch]");
774 what = _("[new ref]");
777 r = s_update_ref(msg, ref, 0);
778 format_display(display, r ? '!' : '*', what,
779 r ? _("unable to update local ref") : NULL,
780 remote, pretty_ref, summary_width);
784 if (in_merge_bases(current, updated)) {
785 struct strbuf quickref = STRBUF_INIT;
787 strbuf_add_unique_abbrev(&quickref, ¤t->object.oid, DEFAULT_ABBREV);
788 strbuf_addstr(&quickref, "..");
789 strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
790 r = s_update_ref("fast-forward", ref, 1);
791 format_display(display, r ? '!' : ' ', quickref.buf,
792 r ? _("unable to update local ref") : NULL,
793 remote, pretty_ref, summary_width);
794 strbuf_release(&quickref);
796 } else if (force || ref->force) {
797 struct strbuf quickref = STRBUF_INIT;
799 strbuf_add_unique_abbrev(&quickref, ¤t->object.oid, DEFAULT_ABBREV);
800 strbuf_addstr(&quickref, "...");
801 strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
802 r = s_update_ref("forced-update", ref, 1);
803 format_display(display, r ? '!' : '+', quickref.buf,
804 r ? _("unable to update local ref") : _("forced update"),
805 remote, pretty_ref, summary_width);
806 strbuf_release(&quickref);
809 format_display(display, '!', _("[rejected]"), _("non-fast-forward"),
810 remote, pretty_ref, summary_width);
815 static int iterate_ref_map(void *cb_data, struct object_id *oid)
817 struct ref **rm = cb_data;
818 struct ref *ref = *rm;
820 while (ref && ref->status == REF_STATUS_REJECT_SHALLOW)
823 return -1; /* end of the list */
825 oidcpy(oid, &ref->old_oid);
829 static int store_updated_refs(const char *raw_url, const char *remote_name,
830 int connectivity_checked, struct ref *ref_map)
833 struct commit *commit;
834 int url_len, i, rc = 0;
835 struct strbuf note = STRBUF_INIT;
836 const char *what, *kind;
839 const char *filename = dry_run ? "/dev/null" : git_path_fetch_head(the_repository);
841 int summary_width = transport_summary_width(ref_map);
843 fp = fopen(filename, "a");
845 return error_errno(_("cannot open %s"), filename);
848 url = transport_anonymize_url(raw_url);
850 url = xstrdup("foreign");
852 if (!connectivity_checked) {
854 if (check_connected(iterate_ref_map, &rm, NULL)) {
855 rc = error(_("%s did not send all necessary objects\n"), url);
860 prepare_format_display(ref_map);
863 * We do a pass for each fetch_head_status type in their enum order, so
864 * merged entries are written before not-for-merge. That lets readers
865 * use FETCH_HEAD as a refname to refer to the ref to be merged.
867 for (want_status = FETCH_HEAD_MERGE;
868 want_status <= FETCH_HEAD_IGNORE;
870 for (rm = ref_map; rm; rm = rm->next) {
871 struct ref *ref = NULL;
872 const char *merge_status_marker = "";
874 if (rm->status == REF_STATUS_REJECT_SHALLOW) {
875 if (want_status == FETCH_HEAD_MERGE)
876 warning(_("reject %s because shallow roots are not allowed to be updated"),
877 rm->peer_ref ? rm->peer_ref->name : rm->name);
881 commit = lookup_commit_reference_gently(the_repository,
885 rm->fetch_head_status = FETCH_HEAD_NOT_FOR_MERGE;
887 if (rm->fetch_head_status != want_status)
891 ref = alloc_ref(rm->peer_ref->name);
892 oidcpy(&ref->old_oid, &rm->peer_ref->old_oid);
893 oidcpy(&ref->new_oid, &rm->old_oid);
894 ref->force = rm->peer_ref->force;
897 if (recurse_submodules != RECURSE_SUBMODULES_OFF)
898 check_for_new_submodule_commits(&rm->old_oid);
900 if (!strcmp(rm->name, "HEAD")) {
904 else if (starts_with(rm->name, "refs/heads/")) {
906 what = rm->name + 11;
908 else if (starts_with(rm->name, "refs/tags/")) {
910 what = rm->name + 10;
912 else if (starts_with(rm->name, "refs/remotes/")) {
913 kind = "remote-tracking branch";
914 what = rm->name + 13;
921 url_len = strlen(url);
922 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
925 if (4 < i && !strncmp(".git", url + i - 3, 4))
931 strbuf_addf(¬e, "%s ", kind);
932 strbuf_addf(¬e, "'%s' of ", what);
934 switch (rm->fetch_head_status) {
935 case FETCH_HEAD_NOT_FOR_MERGE:
936 merge_status_marker = "not-for-merge";
938 case FETCH_HEAD_MERGE:
939 fprintf(fp, "%s\t%s\t%s",
940 oid_to_hex(&rm->old_oid),
943 for (i = 0; i < url_len; ++i)
951 /* do not write anything to FETCH_HEAD */
957 rc |= update_local_ref(ref, what, rm, ¬e,
961 format_display(¬e, '*',
962 *kind ? kind : "branch", NULL,
963 *what ? what : "HEAD",
964 "FETCH_HEAD", summary_width);
966 if (verbosity >= 0 && !shown_url) {
967 fprintf(stderr, _("From %.*s\n"),
972 fprintf(stderr, " %s\n", note.buf);
977 if (rc & STORE_REF_ERROR_DF_CONFLICT)
978 error(_("some local refs could not be updated; try running\n"
979 " 'git remote prune %s' to remove any old, conflicting "
980 "branches"), remote_name);
983 strbuf_release(¬e);
990 * We would want to bypass the object transfer altogether if
991 * everything we are going to fetch already exists and is connected
994 static int check_exist_and_connected(struct ref *ref_map)
996 struct ref *rm = ref_map;
997 struct check_connected_options opt = CHECK_CONNECTED_INIT;
1001 * If we are deepening a shallow clone we already have these
1002 * objects reachable. Running rev-list here will return with
1003 * a good (0) exit status and we'll bypass the fetch that we
1004 * really need to perform. Claiming failure now will ensure
1005 * we perform the network exchange to deepen our history.
1011 * check_connected() allows objects to merely be promised, but
1012 * we need all direct targets to exist.
1014 for (r = rm; r; r = r->next) {
1015 if (!has_object_file(&r->old_oid))
1020 return check_connected(iterate_ref_map, &rm, &opt);
1023 static int fetch_refs(struct transport *transport, struct ref *ref_map)
1025 int ret = check_exist_and_connected(ref_map);
1027 ret = transport_fetch_refs(transport, ref_map);
1030 * Keep the new pack's ".keep" file around to allow the caller
1031 * time to update refs to reference the new objects.
1034 transport_unlock_pack(transport);
1038 /* Update local refs based on the ref values fetched from a remote */
1039 static int consume_refs(struct transport *transport, struct ref *ref_map)
1041 int connectivity_checked = transport->smart_options
1042 ? transport->smart_options->connectivity_checked : 0;
1043 int ret = store_updated_refs(transport->url,
1044 transport->remote->name,
1045 connectivity_checked,
1047 transport_unlock_pack(transport);
1051 static int prune_refs(struct refspec *rs, struct ref *ref_map,
1052 const char *raw_url)
1054 int url_len, i, result = 0;
1055 struct ref *ref, *stale_refs = get_stale_heads(rs, ref_map);
1057 int summary_width = transport_summary_width(stale_refs);
1058 const char *dangling_msg = dry_run
1059 ? _(" (%s will become dangling)")
1060 : _(" (%s has become dangling)");
1063 url = transport_anonymize_url(raw_url);
1065 url = xstrdup("foreign");
1067 url_len = strlen(url);
1068 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
1072 if (4 < i && !strncmp(".git", url + i - 3, 4))
1076 struct string_list refnames = STRING_LIST_INIT_NODUP;
1078 for (ref = stale_refs; ref; ref = ref->next)
1079 string_list_append(&refnames, ref->name);
1081 result = delete_refs("fetch: prune", &refnames, 0);
1082 string_list_clear(&refnames, 0);
1085 if (verbosity >= 0) {
1086 for (ref = stale_refs; ref; ref = ref->next) {
1087 struct strbuf sb = STRBUF_INIT;
1089 fprintf(stderr, _("From %.*s\n"), url_len, url);
1092 format_display(&sb, '-', _("[deleted]"), NULL,
1093 _("(none)"), prettify_refname(ref->name),
1095 fprintf(stderr, " %s\n",sb.buf);
1096 strbuf_release(&sb);
1097 warn_dangling_symref(stderr, dangling_msg, ref->name);
1102 free_refs(stale_refs);
1106 static void check_not_current_branch(struct ref *ref_map)
1108 struct branch *current_branch = branch_get(NULL);
1110 if (is_bare_repository() || !current_branch)
1113 for (; ref_map; ref_map = ref_map->next)
1114 if (ref_map->peer_ref && !strcmp(current_branch->refname,
1115 ref_map->peer_ref->name))
1116 die(_("Refusing to fetch into current branch %s "
1117 "of non-bare repository"), current_branch->refname);
1120 static int truncate_fetch_head(void)
1122 const char *filename = git_path_fetch_head(the_repository);
1123 FILE *fp = fopen_for_writing(filename);
1126 return error_errno(_("cannot open %s"), filename);
1131 static void set_option(struct transport *transport, const char *name, const char *value)
1133 int r = transport_set_option(transport, name, value);
1135 die(_("Option \"%s\" value \"%s\" is not valid for %s"),
1136 name, value, transport->url);
1138 warning(_("Option \"%s\" is ignored for %s\n"),
1139 name, transport->url);
1143 static int add_oid(const char *refname, const struct object_id *oid, int flags,
1146 struct oid_array *oids = cb_data;
1148 oid_array_append(oids, oid);
1152 static void add_negotiation_tips(struct git_transport_options *smart_options)
1154 struct oid_array *oids = xcalloc(1, sizeof(*oids));
1157 for (i = 0; i < negotiation_tip.nr; i++) {
1158 const char *s = negotiation_tip.items[i].string;
1160 if (!has_glob_specials(s)) {
1161 struct object_id oid;
1162 if (get_oid(s, &oid))
1163 die("%s is not a valid object", s);
1164 oid_array_append(oids, &oid);
1168 for_each_glob_ref(add_oid, s, oids);
1169 if (old_nr == oids->nr)
1170 warning("Ignoring --negotiation-tip=%s because it does not match any refs",
1173 smart_options->negotiation_tips = oids;
1176 static struct transport *prepare_transport(struct remote *remote, int deepen)
1178 struct transport *transport;
1180 transport = transport_get(remote, NULL);
1181 transport_set_verbosity(transport, verbosity, progress);
1182 transport->family = family;
1184 set_option(transport, TRANS_OPT_UPLOADPACK, upload_pack);
1186 set_option(transport, TRANS_OPT_KEEP, "yes");
1188 set_option(transport, TRANS_OPT_DEPTH, depth);
1189 if (deepen && deepen_since)
1190 set_option(transport, TRANS_OPT_DEEPEN_SINCE, deepen_since);
1191 if (deepen && deepen_not.nr)
1192 set_option(transport, TRANS_OPT_DEEPEN_NOT,
1193 (const char *)&deepen_not);
1194 if (deepen_relative)
1195 set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, "yes");
1197 set_option(transport, TRANS_OPT_UPDATE_SHALLOW, "yes");
1198 if (filter_options.choice) {
1199 struct strbuf expanded_filter_spec = STRBUF_INIT;
1200 expand_list_objects_filter_spec(&filter_options,
1201 &expanded_filter_spec);
1202 set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER,
1203 expanded_filter_spec.buf);
1204 set_option(transport, TRANS_OPT_FROM_PROMISOR, "1");
1205 strbuf_release(&expanded_filter_spec);
1207 if (negotiation_tip.nr) {
1208 if (transport->smart_options)
1209 add_negotiation_tips(transport->smart_options);
1211 warning("Ignoring --negotiation-tip because the protocol does not support it.");
1216 static void backfill_tags(struct transport *transport, struct ref *ref_map)
1221 * Once we have set TRANS_OPT_DEEPEN_SINCE, we can't unset it
1222 * when remote helper is used (setting it to an empty string
1223 * is not unsetting). We could extend the remote helper
1224 * protocol for that, but for now, just force a new connection
1225 * without deepen-since. Similar story for deepen-not.
1227 cannot_reuse = transport->cannot_reuse ||
1228 deepen_since || deepen_not.nr;
1230 gsecondary = prepare_transport(transport->remote, 0);
1231 transport = gsecondary;
1234 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
1235 transport_set_option(transport, TRANS_OPT_DEPTH, "0");
1236 transport_set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, NULL);
1237 if (!fetch_refs(transport, ref_map))
1238 consume_refs(transport, ref_map);
1241 transport_disconnect(gsecondary);
1246 static int do_fetch(struct transport *transport,
1249 struct ref *ref_map;
1250 int autotags = (transport->remote->fetch_tags == 1);
1252 const struct ref *remote_refs;
1253 struct argv_array ref_prefixes = ARGV_ARRAY_INIT;
1254 int must_list_refs = 1;
1256 if (tags == TAGS_DEFAULT) {
1257 if (transport->remote->fetch_tags == 2)
1259 if (transport->remote->fetch_tags == -1)
1263 /* if not appending, truncate FETCH_HEAD */
1264 if (!append && !dry_run) {
1265 retcode = truncate_fetch_head();
1273 refspec_ref_prefixes(rs, &ref_prefixes);
1276 * We can avoid listing refs if all of them are exact
1280 for (i = 0; i < rs->nr; i++) {
1281 if (!rs->items[i].exact_sha1) {
1286 } else if (transport->remote && transport->remote->fetch.nr)
1287 refspec_ref_prefixes(&transport->remote->fetch, &ref_prefixes);
1289 if (tags == TAGS_SET || tags == TAGS_DEFAULT) {
1291 if (ref_prefixes.argc)
1292 argv_array_push(&ref_prefixes, "refs/tags/");
1296 remote_refs = transport_get_remote_refs(transport, &ref_prefixes);
1300 argv_array_clear(&ref_prefixes);
1302 ref_map = get_ref_map(transport->remote, remote_refs, rs,
1304 if (!update_head_ok)
1305 check_not_current_branch(ref_map);
1307 if (tags == TAGS_DEFAULT && autotags)
1308 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
1311 * We only prune based on refspecs specified
1312 * explicitly (via command line or configuration); we
1313 * don't care whether --tags was specified.
1316 prune_refs(rs, ref_map, transport->url);
1318 prune_refs(&transport->remote->fetch,
1323 if (fetch_refs(transport, ref_map) || consume_refs(transport, ref_map)) {
1330 /* if neither --no-tags nor --tags was specified, do automated tag
1332 if (tags == TAGS_DEFAULT && autotags) {
1333 struct ref **tail = &ref_map;
1335 find_non_local_tags(remote_refs, &ref_map, &tail);
1337 backfill_tags(transport, ref_map);
1345 static int get_one_remote_for_fetch(struct remote *remote, void *priv)
1347 struct string_list *list = priv;
1348 if (!remote->skip_default_update)
1349 string_list_append(list, remote->name);
1353 struct remote_group_data {
1355 struct string_list *list;
1358 static int get_remote_group(const char *key, const char *value, void *priv)
1360 struct remote_group_data *g = priv;
1362 if (skip_prefix(key, "remotes.", &key) && !strcmp(key, g->name)) {
1363 /* split list by white space */
1365 size_t wordlen = strcspn(value, " \t\n");
1368 string_list_append_nodup(g->list,
1369 xstrndup(value, wordlen));
1370 value += wordlen + (value[wordlen] != '\0');
1377 static int add_remote_or_group(const char *name, struct string_list *list)
1379 int prev_nr = list->nr;
1380 struct remote_group_data g;
1381 g.name = name; g.list = list;
1383 git_config(get_remote_group, &g);
1384 if (list->nr == prev_nr) {
1385 struct remote *remote = remote_get(name);
1386 if (!remote_is_configured(remote, 0))
1388 string_list_append(list, remote->name);
1393 static void add_options_to_argv(struct argv_array *argv)
1396 argv_array_push(argv, "--dry-run");
1398 argv_array_push(argv, prune ? "--prune" : "--no-prune");
1399 if (prune_tags != -1)
1400 argv_array_push(argv, prune_tags ? "--prune-tags" : "--no-prune-tags");
1402 argv_array_push(argv, "--update-head-ok");
1404 argv_array_push(argv, "--force");
1406 argv_array_push(argv, "--keep");
1407 if (recurse_submodules == RECURSE_SUBMODULES_ON)
1408 argv_array_push(argv, "--recurse-submodules");
1409 else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND)
1410 argv_array_push(argv, "--recurse-submodules=on-demand");
1411 if (tags == TAGS_SET)
1412 argv_array_push(argv, "--tags");
1413 else if (tags == TAGS_UNSET)
1414 argv_array_push(argv, "--no-tags");
1416 argv_array_push(argv, "-v");
1418 argv_array_push(argv, "-v");
1419 else if (verbosity < 0)
1420 argv_array_push(argv, "-q");
1424 static int fetch_multiple(struct string_list *list)
1427 struct argv_array argv = ARGV_ARRAY_INIT;
1429 if (!append && !dry_run) {
1430 int errcode = truncate_fetch_head();
1435 argv_array_pushl(&argv, "fetch", "--append", NULL);
1436 add_options_to_argv(&argv);
1438 for (i = 0; i < list->nr; i++) {
1439 const char *name = list->items[i].string;
1440 argv_array_push(&argv, name);
1442 printf(_("Fetching %s\n"), name);
1443 if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
1444 error(_("Could not fetch %s"), name);
1447 argv_array_pop(&argv);
1450 argv_array_clear(&argv);
1455 * Fetching from the promisor remote should use the given filter-spec
1456 * or inherit the default filter-spec from the config.
1458 static inline void fetch_one_setup_partial(struct remote *remote)
1461 * Explicit --no-filter argument overrides everything, regardless
1462 * of any prior partial clones and fetches.
1464 if (filter_options.no_filter)
1468 * If no prior partial clone/fetch and the current fetch DID NOT
1469 * request a partial-fetch, do a normal fetch.
1471 if (!repository_format_partial_clone && !filter_options.choice)
1475 * If this is the FIRST partial-fetch request, we enable partial
1476 * on this repo and remember the given filter-spec as the default
1477 * for subsequent fetches to this remote.
1479 if (!repository_format_partial_clone && filter_options.choice) {
1480 partial_clone_register(remote->name, &filter_options);
1485 * We are currently limited to only ONE promisor remote and only
1486 * allow partial-fetches from the promisor remote.
1488 if (strcmp(remote->name, repository_format_partial_clone)) {
1489 if (filter_options.choice)
1490 die(_("--filter can only be used with the remote "
1491 "configured in extensions.partialClone"));
1496 * Do a partial-fetch from the promisor remote using either the
1497 * explicitly given filter-spec or inherit the filter-spec from
1500 if (!filter_options.choice)
1501 partial_clone_get_default_filter_spec(&filter_options);
1505 static int fetch_one(struct remote *remote, int argc, const char **argv, int prune_tags_ok)
1507 struct refspec rs = REFSPEC_INIT_FETCH;
1510 int maybe_prune_tags;
1511 int remote_via_config = remote_is_configured(remote, 0);
1514 die(_("No remote repository specified. Please, specify either a URL or a\n"
1515 "remote name from which new revisions should be fetched."));
1517 gtransport = prepare_transport(remote, 1);
1520 /* no command line request */
1521 if (0 <= remote->prune)
1522 prune = remote->prune;
1523 else if (0 <= fetch_prune_config)
1524 prune = fetch_prune_config;
1526 prune = PRUNE_BY_DEFAULT;
1529 if (prune_tags < 0) {
1530 /* no command line request */
1531 if (0 <= remote->prune_tags)
1532 prune_tags = remote->prune_tags;
1533 else if (0 <= fetch_prune_tags_config)
1534 prune_tags = fetch_prune_tags_config;
1536 prune_tags = PRUNE_TAGS_BY_DEFAULT;
1539 maybe_prune_tags = prune_tags_ok && prune_tags;
1540 if (maybe_prune_tags && remote_via_config)
1541 refspec_append(&remote->fetch, TAG_REFSPEC);
1543 if (maybe_prune_tags && (argc || !remote_via_config))
1544 refspec_append(&rs, TAG_REFSPEC);
1546 for (i = 0; i < argc; i++) {
1547 if (!strcmp(argv[i], "tag")) {
1551 die(_("You need to specify a tag name."));
1553 tag = xstrfmt("refs/tags/%s:refs/tags/%s",
1555 refspec_append(&rs, tag);
1558 refspec_append(&rs, argv[i]);
1562 if (server_options.nr)
1563 gtransport->server_options = &server_options;
1565 sigchain_push_common(unlock_pack_on_signal);
1566 atexit(unlock_pack);
1567 sigchain_push(SIGPIPE, SIG_IGN);
1568 exit_code = do_fetch(gtransport, &rs);
1569 sigchain_pop(SIGPIPE);
1571 transport_disconnect(gtransport);
1576 int cmd_fetch(int argc, const char **argv, const char *prefix)
1579 struct string_list list = STRING_LIST_INIT_DUP;
1580 struct remote *remote = NULL;
1582 int prune_tags_ok = 1;
1583 struct argv_array argv_gc_auto = ARGV_ARRAY_INIT;
1585 packet_trace_identity("fetch");
1587 fetch_if_missing = 0;
1589 /* Record the command line for the reflog */
1590 strbuf_addstr(&default_rla, "fetch");
1591 for (i = 1; i < argc; i++)
1592 strbuf_addf(&default_rla, " %s", argv[i]);
1594 fetch_config_from_gitmodules(&max_children, &recurse_submodules);
1595 git_config(git_fetch_config, NULL);
1597 argc = parse_options(argc, argv, prefix,
1598 builtin_fetch_options, builtin_fetch_usage, 0);
1600 if (deepen_relative) {
1601 if (deepen_relative < 0)
1602 die(_("Negative depth in --deepen is not supported"));
1604 die(_("--deepen and --depth are mutually exclusive"));
1605 depth = xstrfmt("%d", deepen_relative);
1609 die(_("--depth and --unshallow cannot be used together"));
1610 else if (!is_repository_shallow(the_repository))
1611 die(_("--unshallow on a complete repository does not make sense"));
1613 depth = xstrfmt("%d", INFINITE_DEPTH);
1616 /* no need to be strict, transport_set_option() will validate it again */
1617 if (depth && atoi(depth) < 1)
1618 die(_("depth %s is not a positive number"), depth);
1619 if (depth || deepen_since || deepen_not.nr)
1622 if (filter_options.choice && !repository_format_partial_clone)
1623 die("--filter can only be used when extensions.partialClone is set");
1627 die(_("fetch --all does not take a repository argument"));
1629 die(_("fetch --all does not make sense with refspecs"));
1630 (void) for_each_remote(get_one_remote_for_fetch, &list);
1631 } else if (argc == 0) {
1632 /* No arguments -- use default remote */
1633 remote = remote_get(NULL);
1634 } else if (multiple) {
1635 /* All arguments are assumed to be remotes or groups */
1636 for (i = 0; i < argc; i++)
1637 if (!add_remote_or_group(argv[i], &list))
1638 die(_("No such remote or remote group: %s"), argv[i]);
1640 /* Single remote or group */
1641 (void) add_remote_or_group(argv[0], &list);
1643 /* More than one remote */
1645 die(_("Fetching a group and specifying refspecs does not make sense"));
1647 /* Zero or one remotes */
1648 remote = remote_get(argv[0]);
1649 prune_tags_ok = (argc == 1);
1656 if (filter_options.choice || repository_format_partial_clone)
1657 fetch_one_setup_partial(remote);
1658 result = fetch_one(remote, argc, argv, prune_tags_ok);
1660 if (filter_options.choice)
1661 die(_("--filter can only be used with the remote "
1662 "configured in extensions.partialclone"));
1663 /* TODO should this also die if we have a previous partial-clone? */
1664 result = fetch_multiple(&list);
1667 if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
1668 struct argv_array options = ARGV_ARRAY_INIT;
1670 add_options_to_argv(&options);
1671 result = fetch_populated_submodules(the_repository,
1675 recurse_submodules_default,
1678 argv_array_clear(&options);
1681 string_list_clear(&list, 0);
1683 close_object_store(the_repository->objects);
1685 argv_array_pushl(&argv_gc_auto, "gc", "--auto", NULL);
1687 argv_array_push(&argv_gc_auto, "--quiet");
1688 run_command_v_opt(argv_gc_auto.argv, RUN_GIT_CMD);
1689 argv_array_clear(&argv_gc_auto);