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 fetch_show_forced_updates = 1;
43 static int prune = -1; /* unspecified */
44 #define PRUNE_BY_DEFAULT 0 /* do we prune by default? */
46 static int fetch_prune_tags_config = -1; /* unspecified */
47 static int prune_tags = -1; /* unspecified */
48 #define PRUNE_TAGS_BY_DEFAULT 0 /* do we prune tags by default? */
50 static int all, append, dry_run, force, keep, multiple, update_head_ok, verbosity, deepen_relative;
51 static int progress = -1;
52 static int tags = TAGS_DEFAULT, unshallow, update_shallow, deepen;
53 static int max_children = 1;
54 static enum transport_family family;
55 static const char *depth;
56 static const char *deepen_since;
57 static const char *upload_pack;
58 static struct string_list deepen_not = STRING_LIST_INIT_NODUP;
59 static struct strbuf default_rla = STRBUF_INIT;
60 static struct transport *gtransport;
61 static struct transport *gsecondary;
62 static const char *submodule_prefix = "";
63 static int recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
64 static int recurse_submodules_default = RECURSE_SUBMODULES_ON_DEMAND;
65 static int shown_url = 0;
66 static struct refspec refmap = REFSPEC_INIT_FETCH;
67 static struct list_objects_filter_options filter_options;
68 static struct string_list server_options = STRING_LIST_INIT_DUP;
69 static struct string_list negotiation_tip = STRING_LIST_INIT_NODUP;
71 static int git_fetch_config(const char *k, const char *v, void *cb)
73 if (!strcmp(k, "fetch.prune")) {
74 fetch_prune_config = git_config_bool(k, v);
78 if (!strcmp(k, "fetch.prunetags")) {
79 fetch_prune_tags_config = git_config_bool(k, v);
83 if (!strcmp(k, "fetch.showforcedupdates")) {
84 fetch_show_forced_updates = git_config_bool(k, v);
88 if (!strcmp(k, "submodule.recurse")) {
89 int r = git_config_bool(k, v) ?
90 RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;
91 recurse_submodules = r;
94 if (!strcmp(k, "submodule.fetchjobs")) {
95 max_children = parse_submodule_fetchjobs(k, v);
97 } else if (!strcmp(k, "fetch.recursesubmodules")) {
98 recurse_submodules = parse_fetch_recurse_submodules_arg(k, v);
102 return git_default_config(k, v, cb);
105 static int parse_refmap_arg(const struct option *opt, const char *arg, int unset)
107 BUG_ON_OPT_NEG(unset);
110 * "git fetch --refmap='' origin foo"
111 * can be used to tell the command not to store anywhere
113 refspec_append(&refmap, arg);
118 static struct option builtin_fetch_options[] = {
119 OPT__VERBOSITY(&verbosity),
120 OPT_BOOL(0, "all", &all,
121 N_("fetch from all remotes")),
122 OPT_BOOL('a', "append", &append,
123 N_("append to .git/FETCH_HEAD instead of overwriting")),
124 OPT_STRING(0, "upload-pack", &upload_pack, N_("path"),
125 N_("path to upload pack on remote end")),
126 OPT__FORCE(&force, N_("force overwrite of local reference"), 0),
127 OPT_BOOL('m', "multiple", &multiple,
128 N_("fetch from multiple remotes")),
129 OPT_SET_INT('t', "tags", &tags,
130 N_("fetch all tags and associated objects"), TAGS_SET),
131 OPT_SET_INT('n', NULL, &tags,
132 N_("do not fetch all tags (--no-tags)"), TAGS_UNSET),
133 OPT_INTEGER('j', "jobs", &max_children,
134 N_("number of submodules fetched in parallel")),
135 OPT_BOOL('p', "prune", &prune,
136 N_("prune remote-tracking branches no longer on remote")),
137 OPT_BOOL('P', "prune-tags", &prune_tags,
138 N_("prune local tags no longer on remote and clobber changed tags")),
139 { OPTION_CALLBACK, 0, "recurse-submodules", &recurse_submodules, N_("on-demand"),
140 N_("control recursive fetching of submodules"),
141 PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules },
142 OPT_BOOL(0, "dry-run", &dry_run,
144 OPT_BOOL('k', "keep", &keep, N_("keep downloaded pack")),
145 OPT_BOOL('u', "update-head-ok", &update_head_ok,
146 N_("allow updating of HEAD ref")),
147 OPT_BOOL(0, "progress", &progress, N_("force progress reporting")),
148 OPT_STRING(0, "depth", &depth, N_("depth"),
149 N_("deepen history of shallow clone")),
150 OPT_STRING(0, "shallow-since", &deepen_since, N_("time"),
151 N_("deepen history of shallow repository based on time")),
152 OPT_STRING_LIST(0, "shallow-exclude", &deepen_not, N_("revision"),
153 N_("deepen history of shallow clone, excluding rev")),
154 OPT_INTEGER(0, "deepen", &deepen_relative,
155 N_("deepen history of shallow clone")),
156 OPT_SET_INT_F(0, "unshallow", &unshallow,
157 N_("convert to a complete repository"),
159 { OPTION_STRING, 0, "submodule-prefix", &submodule_prefix, N_("dir"),
160 N_("prepend this to submodule path output"), PARSE_OPT_HIDDEN },
161 { OPTION_CALLBACK, 0, "recurse-submodules-default",
162 &recurse_submodules_default, N_("on-demand"),
163 N_("default for recursive fetching of submodules "
164 "(lower priority than config files)"),
165 PARSE_OPT_HIDDEN, option_fetch_parse_recurse_submodules },
166 OPT_BOOL(0, "update-shallow", &update_shallow,
167 N_("accept refs that update .git/shallow")),
168 { OPTION_CALLBACK, 0, "refmap", NULL, N_("refmap"),
169 N_("specify fetch refmap"), PARSE_OPT_NONEG, parse_refmap_arg },
170 OPT_STRING_LIST('o', "server-option", &server_options, N_("server-specific"), N_("option to transmit")),
171 OPT_SET_INT('4', "ipv4", &family, N_("use IPv4 addresses only"),
172 TRANSPORT_FAMILY_IPV4),
173 OPT_SET_INT('6', "ipv6", &family, N_("use IPv6 addresses only"),
174 TRANSPORT_FAMILY_IPV6),
175 OPT_STRING_LIST(0, "negotiation-tip", &negotiation_tip, N_("revision"),
176 N_("report that we have only objects reachable from this object")),
177 OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options),
178 OPT_BOOL(0, "show-forced-updates", &fetch_show_forced_updates,
179 N_("check for forced-updates on all updated branches")),
183 static void unlock_pack(void)
186 transport_unlock_pack(gtransport);
188 transport_unlock_pack(gsecondary);
191 static void unlock_pack_on_signal(int signo)
198 static void add_merge_config(struct ref **head,
199 const struct ref *remote_refs,
200 struct branch *branch,
205 for (i = 0; i < branch->merge_nr; i++) {
206 struct ref *rm, **old_tail = *tail;
207 struct refspec_item refspec;
209 for (rm = *head; rm; rm = rm->next) {
210 if (branch_merge_matches(branch, i, rm->name)) {
211 rm->fetch_head_status = FETCH_HEAD_MERGE;
219 * Not fetched to a remote-tracking branch? We need to fetch
220 * it anyway to allow this branch's "branch.$name.merge"
221 * to be honored by 'git pull', but we do not have to
222 * fail if branch.$name.merge is misconfigured to point
223 * at a nonexisting branch. If we were indeed called by
224 * 'git pull', it will notice the misconfiguration because
225 * there is no entry in the resulting FETCH_HEAD marked
228 memset(&refspec, 0, sizeof(refspec));
229 refspec.src = branch->merge[i]->src;
230 get_fetch_map(remote_refs, &refspec, tail, 1);
231 for (rm = *old_tail; rm; rm = rm->next)
232 rm->fetch_head_status = FETCH_HEAD_MERGE;
236 static int will_fetch(struct ref **head, const unsigned char *sha1)
238 struct ref *rm = *head;
240 if (hasheq(rm->old_oid.hash, sha1))
247 struct refname_hash_entry {
248 struct hashmap_entry ent; /* must be the first member */
249 struct object_id oid;
250 char refname[FLEX_ARRAY];
253 static int refname_hash_entry_cmp(const void *hashmap_cmp_fn_data,
258 const struct refname_hash_entry *e1 = e1_;
259 const struct refname_hash_entry *e2 = e2_;
261 return strcmp(e1->refname, keydata ? keydata : e2->refname);
264 static struct refname_hash_entry *refname_hash_add(struct hashmap *map,
266 const struct object_id *oid)
268 struct refname_hash_entry *ent;
269 size_t len = strlen(refname);
271 FLEX_ALLOC_MEM(ent, refname, refname, len);
272 hashmap_entry_init(ent, strhash(refname));
273 oidcpy(&ent->oid, oid);
274 hashmap_add(map, ent);
278 static int add_one_refname(const char *refname,
279 const struct object_id *oid,
280 int flag, void *cbdata)
282 struct hashmap *refname_map = cbdata;
284 (void) refname_hash_add(refname_map, refname, oid);
288 static void refname_hash_init(struct hashmap *map)
290 hashmap_init(map, refname_hash_entry_cmp, NULL, 0);
293 static int refname_hash_exists(struct hashmap *map, const char *refname)
295 return !!hashmap_get_from_hash(map, strhash(refname), refname);
298 static void find_non_local_tags(const struct ref *refs,
302 struct hashmap existing_refs;
303 struct hashmap remote_refs;
304 struct string_list remote_refs_list = STRING_LIST_INIT_NODUP;
305 struct string_list_item *remote_ref_item;
306 const struct ref *ref;
307 struct refname_hash_entry *item = NULL;
309 refname_hash_init(&existing_refs);
310 refname_hash_init(&remote_refs);
312 for_each_ref(add_one_refname, &existing_refs);
313 for (ref = refs; ref; ref = ref->next) {
314 if (!starts_with(ref->name, "refs/tags/"))
318 * The peeled ref always follows the matching base
319 * ref, so if we see a peeled ref that we don't want
320 * to fetch then we can mark the ref entry in the list
321 * as one to ignore by setting util to NULL.
323 if (ends_with(ref->name, "^{}")) {
325 !has_object_file_with_flags(&ref->old_oid,
326 OBJECT_INFO_QUICK) &&
327 !will_fetch(head, ref->old_oid.hash) &&
328 !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) &&
329 !will_fetch(head, item->oid.hash))
336 * If item is non-NULL here, then we previously saw a
337 * ref not followed by a peeled reference, so we need
338 * to check if it is a lightweight tag that we want to
342 !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) &&
343 !will_fetch(head, item->oid.hash))
348 /* skip duplicates and refs that we already have */
349 if (refname_hash_exists(&remote_refs, ref->name) ||
350 refname_hash_exists(&existing_refs, ref->name))
353 item = refname_hash_add(&remote_refs, ref->name, &ref->old_oid);
354 string_list_insert(&remote_refs_list, ref->name);
356 hashmap_free(&existing_refs, 1);
359 * We may have a final lightweight tag that needs to be
360 * checked to see if it needs fetching.
363 !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) &&
364 !will_fetch(head, item->oid.hash))
368 * For all the tags in the remote_refs_list,
369 * add them to the list of refs to be fetched
371 for_each_string_list_item(remote_ref_item, &remote_refs_list) {
372 const char *refname = remote_ref_item->string;
374 item = hashmap_get_from_hash(&remote_refs, strhash(refname), refname);
376 BUG("unseen remote ref?");
378 /* Unless we have already decided to ignore this item... */
379 if (!is_null_oid(&item->oid)) {
380 struct ref *rm = alloc_ref(item->refname);
381 rm->peer_ref = alloc_ref(item->refname);
382 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 (!fetch_show_forced_updates || in_merge_bases(current, updated)) {
785 struct strbuf quickref = STRBUF_INIT;
788 strbuf_add_unique_abbrev(&quickref, ¤t->object.oid, DEFAULT_ABBREV);
789 strbuf_addstr(&quickref, "..");
790 strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
791 r = s_update_ref("fast-forward", ref, 1);
792 format_display(display, r ? '!' : ' ', quickref.buf,
793 r ? _("unable to update local ref") : NULL,
794 remote, pretty_ref, summary_width);
795 strbuf_release(&quickref);
797 } else if (force || ref->force) {
798 struct strbuf quickref = STRBUF_INIT;
800 strbuf_add_unique_abbrev(&quickref, ¤t->object.oid, DEFAULT_ABBREV);
801 strbuf_addstr(&quickref, "...");
802 strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
803 r = s_update_ref("forced-update", ref, 1);
804 format_display(display, r ? '!' : '+', quickref.buf,
805 r ? _("unable to update local ref") : _("forced update"),
806 remote, pretty_ref, summary_width);
807 strbuf_release(&quickref);
810 format_display(display, '!', _("[rejected]"), _("non-fast-forward"),
811 remote, pretty_ref, summary_width);
816 static int iterate_ref_map(void *cb_data, struct object_id *oid)
818 struct ref **rm = cb_data;
819 struct ref *ref = *rm;
821 while (ref && ref->status == REF_STATUS_REJECT_SHALLOW)
824 return -1; /* end of the list */
826 oidcpy(oid, &ref->old_oid);
830 static int store_updated_refs(const char *raw_url, const char *remote_name,
831 int connectivity_checked, struct ref *ref_map)
834 struct commit *commit;
835 int url_len, i, rc = 0;
836 struct strbuf note = STRBUF_INIT;
837 const char *what, *kind;
840 const char *filename = dry_run ? "/dev/null" : git_path_fetch_head(the_repository);
842 int summary_width = transport_summary_width(ref_map);
844 fp = fopen(filename, "a");
846 return error_errno(_("cannot open %s"), filename);
849 url = transport_anonymize_url(raw_url);
851 url = xstrdup("foreign");
853 if (!connectivity_checked) {
855 if (check_connected(iterate_ref_map, &rm, NULL)) {
856 rc = error(_("%s did not send all necessary objects\n"), url);
861 prepare_format_display(ref_map);
864 * We do a pass for each fetch_head_status type in their enum order, so
865 * merged entries are written before not-for-merge. That lets readers
866 * use FETCH_HEAD as a refname to refer to the ref to be merged.
868 for (want_status = FETCH_HEAD_MERGE;
869 want_status <= FETCH_HEAD_IGNORE;
871 for (rm = ref_map; rm; rm = rm->next) {
872 struct ref *ref = NULL;
873 const char *merge_status_marker = "";
875 if (rm->status == REF_STATUS_REJECT_SHALLOW) {
876 if (want_status == FETCH_HEAD_MERGE)
877 warning(_("reject %s because shallow roots are not allowed to be updated"),
878 rm->peer_ref ? rm->peer_ref->name : rm->name);
882 commit = lookup_commit_reference_gently(the_repository,
886 rm->fetch_head_status = FETCH_HEAD_NOT_FOR_MERGE;
888 if (rm->fetch_head_status != want_status)
892 ref = alloc_ref(rm->peer_ref->name);
893 oidcpy(&ref->old_oid, &rm->peer_ref->old_oid);
894 oidcpy(&ref->new_oid, &rm->old_oid);
895 ref->force = rm->peer_ref->force;
898 if (recurse_submodules != RECURSE_SUBMODULES_OFF)
899 check_for_new_submodule_commits(&rm->old_oid);
901 if (!strcmp(rm->name, "HEAD")) {
905 else if (starts_with(rm->name, "refs/heads/")) {
907 what = rm->name + 11;
909 else if (starts_with(rm->name, "refs/tags/")) {
911 what = rm->name + 10;
913 else if (starts_with(rm->name, "refs/remotes/")) {
914 kind = "remote-tracking branch";
915 what = rm->name + 13;
922 url_len = strlen(url);
923 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
926 if (4 < i && !strncmp(".git", url + i - 3, 4))
932 strbuf_addf(¬e, "%s ", kind);
933 strbuf_addf(¬e, "'%s' of ", what);
935 switch (rm->fetch_head_status) {
936 case FETCH_HEAD_NOT_FOR_MERGE:
937 merge_status_marker = "not-for-merge";
939 case FETCH_HEAD_MERGE:
940 fprintf(fp, "%s\t%s\t%s",
941 oid_to_hex(&rm->old_oid),
944 for (i = 0; i < url_len; ++i)
952 /* do not write anything to FETCH_HEAD */
958 rc |= update_local_ref(ref, what, rm, ¬e,
962 format_display(¬e, '*',
963 *kind ? kind : "branch", NULL,
964 *what ? what : "HEAD",
965 "FETCH_HEAD", summary_width);
967 if (verbosity >= 0 && !shown_url) {
968 fprintf(stderr, _("From %.*s\n"),
973 fprintf(stderr, " %s\n", note.buf);
978 if (rc & STORE_REF_ERROR_DF_CONFLICT)
979 error(_("some local refs could not be updated; try running\n"
980 " 'git remote prune %s' to remove any old, conflicting "
981 "branches"), remote_name);
984 strbuf_release(¬e);
991 * We would want to bypass the object transfer altogether if
992 * everything we are going to fetch already exists and is connected
995 static int check_exist_and_connected(struct ref *ref_map)
997 struct ref *rm = ref_map;
998 struct check_connected_options opt = CHECK_CONNECTED_INIT;
1002 * If we are deepening a shallow clone we already have these
1003 * objects reachable. Running rev-list here will return with
1004 * a good (0) exit status and we'll bypass the fetch that we
1005 * really need to perform. Claiming failure now will ensure
1006 * we perform the network exchange to deepen our history.
1012 * check_connected() allows objects to merely be promised, but
1013 * we need all direct targets to exist.
1015 for (r = rm; r; r = r->next) {
1016 if (!has_object_file(&r->old_oid))
1021 return check_connected(iterate_ref_map, &rm, &opt);
1024 static int fetch_refs(struct transport *transport, struct ref *ref_map)
1026 int ret = check_exist_and_connected(ref_map);
1028 ret = transport_fetch_refs(transport, ref_map);
1031 * Keep the new pack's ".keep" file around to allow the caller
1032 * time to update refs to reference the new objects.
1035 transport_unlock_pack(transport);
1039 /* Update local refs based on the ref values fetched from a remote */
1040 static int consume_refs(struct transport *transport, struct ref *ref_map)
1042 int connectivity_checked = transport->smart_options
1043 ? transport->smart_options->connectivity_checked : 0;
1044 int ret = store_updated_refs(transport->url,
1045 transport->remote->name,
1046 connectivity_checked,
1048 transport_unlock_pack(transport);
1052 static int prune_refs(struct refspec *rs, struct ref *ref_map,
1053 const char *raw_url)
1055 int url_len, i, result = 0;
1056 struct ref *ref, *stale_refs = get_stale_heads(rs, ref_map);
1058 int summary_width = transport_summary_width(stale_refs);
1059 const char *dangling_msg = dry_run
1060 ? _(" (%s will become dangling)")
1061 : _(" (%s has become dangling)");
1064 url = transport_anonymize_url(raw_url);
1066 url = xstrdup("foreign");
1068 url_len = strlen(url);
1069 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
1073 if (4 < i && !strncmp(".git", url + i - 3, 4))
1077 struct string_list refnames = STRING_LIST_INIT_NODUP;
1079 for (ref = stale_refs; ref; ref = ref->next)
1080 string_list_append(&refnames, ref->name);
1082 result = delete_refs("fetch: prune", &refnames, 0);
1083 string_list_clear(&refnames, 0);
1086 if (verbosity >= 0) {
1087 for (ref = stale_refs; ref; ref = ref->next) {
1088 struct strbuf sb = STRBUF_INIT;
1090 fprintf(stderr, _("From %.*s\n"), url_len, url);
1093 format_display(&sb, '-', _("[deleted]"), NULL,
1094 _("(none)"), prettify_refname(ref->name),
1096 fprintf(stderr, " %s\n",sb.buf);
1097 strbuf_release(&sb);
1098 warn_dangling_symref(stderr, dangling_msg, ref->name);
1103 free_refs(stale_refs);
1107 static void check_not_current_branch(struct ref *ref_map)
1109 struct branch *current_branch = branch_get(NULL);
1111 if (is_bare_repository() || !current_branch)
1114 for (; ref_map; ref_map = ref_map->next)
1115 if (ref_map->peer_ref && !strcmp(current_branch->refname,
1116 ref_map->peer_ref->name))
1117 die(_("Refusing to fetch into current branch %s "
1118 "of non-bare repository"), current_branch->refname);
1121 static int truncate_fetch_head(void)
1123 const char *filename = git_path_fetch_head(the_repository);
1124 FILE *fp = fopen_for_writing(filename);
1127 return error_errno(_("cannot open %s"), filename);
1132 static void set_option(struct transport *transport, const char *name, const char *value)
1134 int r = transport_set_option(transport, name, value);
1136 die(_("Option \"%s\" value \"%s\" is not valid for %s"),
1137 name, value, transport->url);
1139 warning(_("Option \"%s\" is ignored for %s\n"),
1140 name, transport->url);
1144 static int add_oid(const char *refname, const struct object_id *oid, int flags,
1147 struct oid_array *oids = cb_data;
1149 oid_array_append(oids, oid);
1153 static void add_negotiation_tips(struct git_transport_options *smart_options)
1155 struct oid_array *oids = xcalloc(1, sizeof(*oids));
1158 for (i = 0; i < negotiation_tip.nr; i++) {
1159 const char *s = negotiation_tip.items[i].string;
1161 if (!has_glob_specials(s)) {
1162 struct object_id oid;
1163 if (get_oid(s, &oid))
1164 die("%s is not a valid object", s);
1165 oid_array_append(oids, &oid);
1169 for_each_glob_ref(add_oid, s, oids);
1170 if (old_nr == oids->nr)
1171 warning("Ignoring --negotiation-tip=%s because it does not match any refs",
1174 smart_options->negotiation_tips = oids;
1177 static struct transport *prepare_transport(struct remote *remote, int deepen)
1179 struct transport *transport;
1181 transport = transport_get(remote, NULL);
1182 transport_set_verbosity(transport, verbosity, progress);
1183 transport->family = family;
1185 set_option(transport, TRANS_OPT_UPLOADPACK, upload_pack);
1187 set_option(transport, TRANS_OPT_KEEP, "yes");
1189 set_option(transport, TRANS_OPT_DEPTH, depth);
1190 if (deepen && deepen_since)
1191 set_option(transport, TRANS_OPT_DEEPEN_SINCE, deepen_since);
1192 if (deepen && deepen_not.nr)
1193 set_option(transport, TRANS_OPT_DEEPEN_NOT,
1194 (const char *)&deepen_not);
1195 if (deepen_relative)
1196 set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, "yes");
1198 set_option(transport, TRANS_OPT_UPDATE_SHALLOW, "yes");
1199 if (filter_options.choice) {
1200 struct strbuf expanded_filter_spec = STRBUF_INIT;
1201 expand_list_objects_filter_spec(&filter_options,
1202 &expanded_filter_spec);
1203 set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER,
1204 expanded_filter_spec.buf);
1205 set_option(transport, TRANS_OPT_FROM_PROMISOR, "1");
1206 strbuf_release(&expanded_filter_spec);
1208 if (negotiation_tip.nr) {
1209 if (transport->smart_options)
1210 add_negotiation_tips(transport->smart_options);
1212 warning("Ignoring --negotiation-tip because the protocol does not support it.");
1217 static void backfill_tags(struct transport *transport, struct ref *ref_map)
1222 * Once we have set TRANS_OPT_DEEPEN_SINCE, we can't unset it
1223 * when remote helper is used (setting it to an empty string
1224 * is not unsetting). We could extend the remote helper
1225 * protocol for that, but for now, just force a new connection
1226 * without deepen-since. Similar story for deepen-not.
1228 cannot_reuse = transport->cannot_reuse ||
1229 deepen_since || deepen_not.nr;
1231 gsecondary = prepare_transport(transport->remote, 0);
1232 transport = gsecondary;
1235 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
1236 transport_set_option(transport, TRANS_OPT_DEPTH, "0");
1237 transport_set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, NULL);
1238 if (!fetch_refs(transport, ref_map))
1239 consume_refs(transport, ref_map);
1242 transport_disconnect(gsecondary);
1247 static int do_fetch(struct transport *transport,
1250 struct ref *ref_map;
1251 int autotags = (transport->remote->fetch_tags == 1);
1253 const struct ref *remote_refs;
1254 struct argv_array ref_prefixes = ARGV_ARRAY_INIT;
1255 int must_list_refs = 1;
1257 if (tags == TAGS_DEFAULT) {
1258 if (transport->remote->fetch_tags == 2)
1260 if (transport->remote->fetch_tags == -1)
1264 /* if not appending, truncate FETCH_HEAD */
1265 if (!append && !dry_run) {
1266 retcode = truncate_fetch_head();
1274 refspec_ref_prefixes(rs, &ref_prefixes);
1277 * We can avoid listing refs if all of them are exact
1281 for (i = 0; i < rs->nr; i++) {
1282 if (!rs->items[i].exact_sha1) {
1287 } else if (transport->remote && transport->remote->fetch.nr)
1288 refspec_ref_prefixes(&transport->remote->fetch, &ref_prefixes);
1290 if (tags == TAGS_SET || tags == TAGS_DEFAULT) {
1292 if (ref_prefixes.argc)
1293 argv_array_push(&ref_prefixes, "refs/tags/");
1297 remote_refs = transport_get_remote_refs(transport, &ref_prefixes);
1301 argv_array_clear(&ref_prefixes);
1303 ref_map = get_ref_map(transport->remote, remote_refs, rs,
1305 if (!update_head_ok)
1306 check_not_current_branch(ref_map);
1308 if (tags == TAGS_DEFAULT && autotags)
1309 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
1312 * We only prune based on refspecs specified
1313 * explicitly (via command line or configuration); we
1314 * don't care whether --tags was specified.
1317 prune_refs(rs, ref_map, transport->url);
1319 prune_refs(&transport->remote->fetch,
1324 if (fetch_refs(transport, ref_map) || consume_refs(transport, ref_map)) {
1331 /* if neither --no-tags nor --tags was specified, do automated tag
1333 if (tags == TAGS_DEFAULT && autotags) {
1334 struct ref **tail = &ref_map;
1336 find_non_local_tags(remote_refs, &ref_map, &tail);
1338 backfill_tags(transport, ref_map);
1346 static int get_one_remote_for_fetch(struct remote *remote, void *priv)
1348 struct string_list *list = priv;
1349 if (!remote->skip_default_update)
1350 string_list_append(list, remote->name);
1354 struct remote_group_data {
1356 struct string_list *list;
1359 static int get_remote_group(const char *key, const char *value, void *priv)
1361 struct remote_group_data *g = priv;
1363 if (skip_prefix(key, "remotes.", &key) && !strcmp(key, g->name)) {
1364 /* split list by white space */
1366 size_t wordlen = strcspn(value, " \t\n");
1369 string_list_append_nodup(g->list,
1370 xstrndup(value, wordlen));
1371 value += wordlen + (value[wordlen] != '\0');
1378 static int add_remote_or_group(const char *name, struct string_list *list)
1380 int prev_nr = list->nr;
1381 struct remote_group_data g;
1382 g.name = name; g.list = list;
1384 git_config(get_remote_group, &g);
1385 if (list->nr == prev_nr) {
1386 struct remote *remote = remote_get(name);
1387 if (!remote_is_configured(remote, 0))
1389 string_list_append(list, remote->name);
1394 static void add_options_to_argv(struct argv_array *argv)
1397 argv_array_push(argv, "--dry-run");
1399 argv_array_push(argv, prune ? "--prune" : "--no-prune");
1400 if (prune_tags != -1)
1401 argv_array_push(argv, prune_tags ? "--prune-tags" : "--no-prune-tags");
1403 argv_array_push(argv, "--update-head-ok");
1405 argv_array_push(argv, "--force");
1407 argv_array_push(argv, "--keep");
1408 if (recurse_submodules == RECURSE_SUBMODULES_ON)
1409 argv_array_push(argv, "--recurse-submodules");
1410 else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND)
1411 argv_array_push(argv, "--recurse-submodules=on-demand");
1412 if (tags == TAGS_SET)
1413 argv_array_push(argv, "--tags");
1414 else if (tags == TAGS_UNSET)
1415 argv_array_push(argv, "--no-tags");
1417 argv_array_push(argv, "-v");
1419 argv_array_push(argv, "-v");
1420 else if (verbosity < 0)
1421 argv_array_push(argv, "-q");
1425 static int fetch_multiple(struct string_list *list)
1428 struct argv_array argv = ARGV_ARRAY_INIT;
1430 if (!append && !dry_run) {
1431 int errcode = truncate_fetch_head();
1436 argv_array_pushl(&argv, "fetch", "--append", NULL);
1437 add_options_to_argv(&argv);
1439 for (i = 0; i < list->nr; i++) {
1440 const char *name = list->items[i].string;
1441 argv_array_push(&argv, name);
1443 printf(_("Fetching %s\n"), name);
1444 if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
1445 error(_("Could not fetch %s"), name);
1448 argv_array_pop(&argv);
1451 argv_array_clear(&argv);
1456 * Fetching from the promisor remote should use the given filter-spec
1457 * or inherit the default filter-spec from the config.
1459 static inline void fetch_one_setup_partial(struct remote *remote)
1462 * Explicit --no-filter argument overrides everything, regardless
1463 * of any prior partial clones and fetches.
1465 if (filter_options.no_filter)
1469 * If no prior partial clone/fetch and the current fetch DID NOT
1470 * request a partial-fetch, do a normal fetch.
1472 if (!repository_format_partial_clone && !filter_options.choice)
1476 * If this is the FIRST partial-fetch request, we enable partial
1477 * on this repo and remember the given filter-spec as the default
1478 * for subsequent fetches to this remote.
1480 if (!repository_format_partial_clone && filter_options.choice) {
1481 partial_clone_register(remote->name, &filter_options);
1486 * We are currently limited to only ONE promisor remote and only
1487 * allow partial-fetches from the promisor remote.
1489 if (strcmp(remote->name, repository_format_partial_clone)) {
1490 if (filter_options.choice)
1491 die(_("--filter can only be used with the remote "
1492 "configured in extensions.partialClone"));
1497 * Do a partial-fetch from the promisor remote using either the
1498 * explicitly given filter-spec or inherit the filter-spec from
1501 if (!filter_options.choice)
1502 partial_clone_get_default_filter_spec(&filter_options);
1506 static int fetch_one(struct remote *remote, int argc, const char **argv, int prune_tags_ok)
1508 struct refspec rs = REFSPEC_INIT_FETCH;
1511 int maybe_prune_tags;
1512 int remote_via_config = remote_is_configured(remote, 0);
1515 die(_("No remote repository specified. Please, specify either a URL or a\n"
1516 "remote name from which new revisions should be fetched."));
1518 gtransport = prepare_transport(remote, 1);
1521 /* no command line request */
1522 if (0 <= remote->prune)
1523 prune = remote->prune;
1524 else if (0 <= fetch_prune_config)
1525 prune = fetch_prune_config;
1527 prune = PRUNE_BY_DEFAULT;
1530 if (prune_tags < 0) {
1531 /* no command line request */
1532 if (0 <= remote->prune_tags)
1533 prune_tags = remote->prune_tags;
1534 else if (0 <= fetch_prune_tags_config)
1535 prune_tags = fetch_prune_tags_config;
1537 prune_tags = PRUNE_TAGS_BY_DEFAULT;
1540 maybe_prune_tags = prune_tags_ok && prune_tags;
1541 if (maybe_prune_tags && remote_via_config)
1542 refspec_append(&remote->fetch, TAG_REFSPEC);
1544 if (maybe_prune_tags && (argc || !remote_via_config))
1545 refspec_append(&rs, TAG_REFSPEC);
1547 for (i = 0; i < argc; i++) {
1548 if (!strcmp(argv[i], "tag")) {
1552 die(_("You need to specify a tag name."));
1554 tag = xstrfmt("refs/tags/%s:refs/tags/%s",
1556 refspec_append(&rs, tag);
1559 refspec_append(&rs, argv[i]);
1563 if (server_options.nr)
1564 gtransport->server_options = &server_options;
1566 sigchain_push_common(unlock_pack_on_signal);
1567 atexit(unlock_pack);
1568 sigchain_push(SIGPIPE, SIG_IGN);
1569 exit_code = do_fetch(gtransport, &rs);
1570 sigchain_pop(SIGPIPE);
1572 transport_disconnect(gtransport);
1577 int cmd_fetch(int argc, const char **argv, const char *prefix)
1580 struct string_list list = STRING_LIST_INIT_DUP;
1581 struct remote *remote = NULL;
1583 int prune_tags_ok = 1;
1584 struct argv_array argv_gc_auto = ARGV_ARRAY_INIT;
1586 packet_trace_identity("fetch");
1588 fetch_if_missing = 0;
1590 /* Record the command line for the reflog */
1591 strbuf_addstr(&default_rla, "fetch");
1592 for (i = 1; i < argc; i++)
1593 strbuf_addf(&default_rla, " %s", argv[i]);
1595 fetch_config_from_gitmodules(&max_children, &recurse_submodules);
1596 git_config(git_fetch_config, NULL);
1598 argc = parse_options(argc, argv, prefix,
1599 builtin_fetch_options, builtin_fetch_usage, 0);
1601 if (deepen_relative) {
1602 if (deepen_relative < 0)
1603 die(_("Negative depth in --deepen is not supported"));
1605 die(_("--deepen and --depth are mutually exclusive"));
1606 depth = xstrfmt("%d", deepen_relative);
1610 die(_("--depth and --unshallow cannot be used together"));
1611 else if (!is_repository_shallow(the_repository))
1612 die(_("--unshallow on a complete repository does not make sense"));
1614 depth = xstrfmt("%d", INFINITE_DEPTH);
1617 /* no need to be strict, transport_set_option() will validate it again */
1618 if (depth && atoi(depth) < 1)
1619 die(_("depth %s is not a positive number"), depth);
1620 if (depth || deepen_since || deepen_not.nr)
1623 if (filter_options.choice && !repository_format_partial_clone)
1624 die("--filter can only be used when extensions.partialClone is set");
1628 die(_("fetch --all does not take a repository argument"));
1630 die(_("fetch --all does not make sense with refspecs"));
1631 (void) for_each_remote(get_one_remote_for_fetch, &list);
1632 } else if (argc == 0) {
1633 /* No arguments -- use default remote */
1634 remote = remote_get(NULL);
1635 } else if (multiple) {
1636 /* All arguments are assumed to be remotes or groups */
1637 for (i = 0; i < argc; i++)
1638 if (!add_remote_or_group(argv[i], &list))
1639 die(_("No such remote or remote group: %s"), argv[i]);
1641 /* Single remote or group */
1642 (void) add_remote_or_group(argv[0], &list);
1644 /* More than one remote */
1646 die(_("Fetching a group and specifying refspecs does not make sense"));
1648 /* Zero or one remotes */
1649 remote = remote_get(argv[0]);
1650 prune_tags_ok = (argc == 1);
1657 if (filter_options.choice || repository_format_partial_clone)
1658 fetch_one_setup_partial(remote);
1659 result = fetch_one(remote, argc, argv, prune_tags_ok);
1661 if (filter_options.choice)
1662 die(_("--filter can only be used with the remote "
1663 "configured in extensions.partialclone"));
1664 /* TODO should this also die if we have a previous partial-clone? */
1665 result = fetch_multiple(&list);
1668 if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
1669 struct argv_array options = ARGV_ARRAY_INIT;
1671 add_options_to_argv(&options);
1672 result = fetch_populated_submodules(the_repository,
1676 recurse_submodules_default,
1679 argv_array_clear(&options);
1682 string_list_clear(&list, 0);
1684 close_all_packs(the_repository->objects);
1686 argv_array_pushl(&argv_gc_auto, "gc", "--auto", NULL);
1688 argv_array_push(&argv_gc_auto, "--quiet");
1689 run_command_v_opt(argv_gc_auto.argv, RUN_GIT_CMD);
1690 argv_array_clear(&argv_gc_auto);