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)
102 * "git fetch --refmap='' origin foo"
103 * can be used to tell the command not to store anywhere
105 refspec_append(&refmap, arg);
110 static struct option builtin_fetch_options[] = {
111 OPT__VERBOSITY(&verbosity),
112 OPT_BOOL(0, "all", &all,
113 N_("fetch from all remotes")),
114 OPT_BOOL('a', "append", &append,
115 N_("append to .git/FETCH_HEAD instead of overwriting")),
116 OPT_STRING(0, "upload-pack", &upload_pack, N_("path"),
117 N_("path to upload pack on remote end")),
118 OPT__FORCE(&force, N_("force overwrite of local reference"), 0),
119 OPT_BOOL('m', "multiple", &multiple,
120 N_("fetch from multiple remotes")),
121 OPT_SET_INT('t', "tags", &tags,
122 N_("fetch all tags and associated objects"), TAGS_SET),
123 OPT_SET_INT('n', NULL, &tags,
124 N_("do not fetch all tags (--no-tags)"), TAGS_UNSET),
125 OPT_INTEGER('j', "jobs", &max_children,
126 N_("number of submodules fetched in parallel")),
127 OPT_BOOL('p', "prune", &prune,
128 N_("prune remote-tracking branches no longer on remote")),
129 OPT_BOOL('P', "prune-tags", &prune_tags,
130 N_("prune local tags no longer on remote and clobber changed tags")),
131 { OPTION_CALLBACK, 0, "recurse-submodules", &recurse_submodules, N_("on-demand"),
132 N_("control recursive fetching of submodules"),
133 PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules },
134 OPT_BOOL(0, "dry-run", &dry_run,
136 OPT_BOOL('k', "keep", &keep, N_("keep downloaded pack")),
137 OPT_BOOL('u', "update-head-ok", &update_head_ok,
138 N_("allow updating of HEAD ref")),
139 OPT_BOOL(0, "progress", &progress, N_("force progress reporting")),
140 OPT_STRING(0, "depth", &depth, N_("depth"),
141 N_("deepen history of shallow clone")),
142 OPT_STRING(0, "shallow-since", &deepen_since, N_("time"),
143 N_("deepen history of shallow repository based on time")),
144 OPT_STRING_LIST(0, "shallow-exclude", &deepen_not, N_("revision"),
145 N_("deepen history of shallow clone, excluding rev")),
146 OPT_INTEGER(0, "deepen", &deepen_relative,
147 N_("deepen history of shallow clone")),
148 OPT_SET_INT_F(0, "unshallow", &unshallow,
149 N_("convert to a complete repository"),
151 { OPTION_STRING, 0, "submodule-prefix", &submodule_prefix, N_("dir"),
152 N_("prepend this to submodule path output"), PARSE_OPT_HIDDEN },
153 { OPTION_CALLBACK, 0, "recurse-submodules-default",
154 &recurse_submodules_default, N_("on-demand"),
155 N_("default for recursive fetching of submodules "
156 "(lower priority than config files)"),
157 PARSE_OPT_HIDDEN, option_fetch_parse_recurse_submodules },
158 OPT_BOOL(0, "update-shallow", &update_shallow,
159 N_("accept refs that update .git/shallow")),
160 { OPTION_CALLBACK, 0, "refmap", NULL, N_("refmap"),
161 N_("specify fetch refmap"), PARSE_OPT_NONEG, parse_refmap_arg },
162 OPT_STRING_LIST('o', "server-option", &server_options, N_("server-specific"), N_("option to transmit")),
163 OPT_SET_INT('4', "ipv4", &family, N_("use IPv4 addresses only"),
164 TRANSPORT_FAMILY_IPV4),
165 OPT_SET_INT('6', "ipv6", &family, N_("use IPv6 addresses only"),
166 TRANSPORT_FAMILY_IPV6),
167 OPT_STRING_LIST(0, "negotiation-tip", &negotiation_tip, N_("revision"),
168 N_("report that we have only objects reachable from this object")),
169 OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options),
173 static void unlock_pack(void)
176 transport_unlock_pack(gtransport);
178 transport_unlock_pack(gsecondary);
181 static void unlock_pack_on_signal(int signo)
188 static void add_merge_config(struct ref **head,
189 const struct ref *remote_refs,
190 struct branch *branch,
195 for (i = 0; i < branch->merge_nr; i++) {
196 struct ref *rm, **old_tail = *tail;
197 struct refspec_item refspec;
199 for (rm = *head; rm; rm = rm->next) {
200 if (branch_merge_matches(branch, i, rm->name)) {
201 rm->fetch_head_status = FETCH_HEAD_MERGE;
209 * Not fetched to a remote-tracking branch? We need to fetch
210 * it anyway to allow this branch's "branch.$name.merge"
211 * to be honored by 'git pull', but we do not have to
212 * fail if branch.$name.merge is misconfigured to point
213 * at a nonexisting branch. If we were indeed called by
214 * 'git pull', it will notice the misconfiguration because
215 * there is no entry in the resulting FETCH_HEAD marked
218 memset(&refspec, 0, sizeof(refspec));
219 refspec.src = branch->merge[i]->src;
220 get_fetch_map(remote_refs, &refspec, tail, 1);
221 for (rm = *old_tail; rm; rm = rm->next)
222 rm->fetch_head_status = FETCH_HEAD_MERGE;
226 static int will_fetch(struct ref **head, const unsigned char *sha1)
228 struct ref *rm = *head;
230 if (hasheq(rm->old_oid.hash, sha1))
237 struct refname_hash_entry {
238 struct hashmap_entry ent; /* must be the first member */
239 struct object_id oid;
240 char refname[FLEX_ARRAY];
243 static int refname_hash_entry_cmp(const void *hashmap_cmp_fn_data,
248 const struct refname_hash_entry *e1 = e1_;
249 const struct refname_hash_entry *e2 = e2_;
251 return strcmp(e1->refname, keydata ? keydata : e2->refname);
254 static struct refname_hash_entry *refname_hash_add(struct hashmap *map,
256 const struct object_id *oid)
258 struct refname_hash_entry *ent;
259 size_t len = strlen(refname);
261 FLEX_ALLOC_MEM(ent, refname, refname, len);
262 hashmap_entry_init(ent, strhash(refname));
263 oidcpy(&ent->oid, oid);
264 hashmap_add(map, ent);
268 static int add_one_refname(const char *refname,
269 const struct object_id *oid,
270 int flag, void *cbdata)
272 struct hashmap *refname_map = cbdata;
274 (void) refname_hash_add(refname_map, refname, oid);
278 static void refname_hash_init(struct hashmap *map)
280 hashmap_init(map, refname_hash_entry_cmp, NULL, 0);
283 static int refname_hash_exists(struct hashmap *map, const char *refname)
285 return !!hashmap_get_from_hash(map, strhash(refname), refname);
288 static void clear_item(struct refname_hash_entry *item)
293 static void find_non_local_tags(const struct ref *refs,
297 struct hashmap existing_refs;
298 struct hashmap remote_refs;
299 struct string_list remote_refs_list = STRING_LIST_INIT_NODUP;
300 struct string_list_item *remote_ref_item;
301 const struct ref *ref;
302 struct refname_hash_entry *item = NULL;
304 refname_hash_init(&existing_refs);
305 refname_hash_init(&remote_refs);
307 for_each_ref(add_one_refname, &existing_refs);
308 for (ref = refs; ref; ref = ref->next) {
309 if (!starts_with(ref->name, "refs/tags/"))
313 * The peeled ref always follows the matching base
314 * ref, so if we see a peeled ref that we don't want
315 * to fetch then we can mark the ref entry in the list
316 * as one to ignore by setting util to NULL.
318 if (ends_with(ref->name, "^{}")) {
320 !has_object_file_with_flags(&ref->old_oid,
321 OBJECT_INFO_QUICK) &&
322 !will_fetch(head, ref->old_oid.hash) &&
323 !has_sha1_file_with_flags(item->oid.hash,
324 OBJECT_INFO_QUICK) &&
325 !will_fetch(head, item->oid.hash))
332 * If item is non-NULL here, then we previously saw a
333 * ref not followed by a peeled reference, so we need
334 * to check if it is a lightweight tag that we want to
338 !has_sha1_file_with_flags(item->oid.hash, OBJECT_INFO_QUICK) &&
339 !will_fetch(head, item->oid.hash))
344 /* skip duplicates and refs that we already have */
345 if (refname_hash_exists(&remote_refs, ref->name) ||
346 refname_hash_exists(&existing_refs, ref->name))
349 item = refname_hash_add(&remote_refs, ref->name, &ref->old_oid);
350 string_list_insert(&remote_refs_list, ref->name);
352 hashmap_free(&existing_refs, 1);
355 * We may have a final lightweight tag that needs to be
356 * checked to see if it needs fetching.
359 !has_sha1_file_with_flags(item->oid.hash, OBJECT_INFO_QUICK) &&
360 !will_fetch(head, item->oid.hash))
364 * For all the tags in the remote_refs_list,
365 * add them to the list of refs to be fetched
367 for_each_string_list_item(remote_ref_item, &remote_refs_list) {
368 const char *refname = remote_ref_item->string;
370 item = hashmap_get_from_hash(&remote_refs, strhash(refname), refname);
372 BUG("unseen remote ref?");
374 /* Unless we have already decided to ignore this item... */
375 if (!is_null_oid(&item->oid)) {
376 struct ref *rm = alloc_ref(item->refname);
377 rm->peer_ref = alloc_ref(item->refname);
378 oidcpy(&rm->old_oid, &item->oid);
383 hashmap_free(&remote_refs, 1);
384 string_list_clear(&remote_refs_list, 0);
387 static struct ref *get_ref_map(struct remote *remote,
388 const struct ref *remote_refs,
390 int tags, int *autotags)
394 struct ref *ref_map = NULL;
395 struct ref **tail = &ref_map;
397 /* opportunistically-updated references: */
398 struct ref *orefs = NULL, **oref_tail = &orefs;
400 struct hashmap existing_refs;
403 struct refspec *fetch_refspec;
405 for (i = 0; i < rs->nr; i++) {
406 get_fetch_map(remote_refs, &rs->items[i], &tail, 0);
407 if (rs->items[i].dst && rs->items[i].dst[0])
410 /* Merge everything on the command line (but not --tags) */
411 for (rm = ref_map; rm; rm = rm->next)
412 rm->fetch_head_status = FETCH_HEAD_MERGE;
415 * For any refs that we happen to be fetching via
416 * command-line arguments, the destination ref might
417 * have been missing or have been different than the
418 * remote-tracking ref that would be derived from the
419 * configured refspec. In these cases, we want to
420 * take the opportunity to update their configured
421 * remote-tracking reference. However, we do not want
422 * to mention these entries in FETCH_HEAD at all, as
423 * they would simply be duplicates of existing
424 * entries, so we set them FETCH_HEAD_IGNORE below.
426 * We compute these entries now, based only on the
427 * refspecs specified on the command line. But we add
428 * them to the list following the refspecs resulting
429 * from the tags option so that one of the latter,
430 * which has FETCH_HEAD_NOT_FOR_MERGE, is not removed
431 * by ref_remove_duplicates() in favor of one of these
432 * opportunistic entries with FETCH_HEAD_IGNORE.
435 fetch_refspec = &refmap;
437 fetch_refspec = &remote->fetch;
439 for (i = 0; i < fetch_refspec->nr; i++)
440 get_fetch_map(ref_map, &fetch_refspec->items[i], &oref_tail, 1);
441 } else if (refmap.nr) {
442 die("--refmap option is only meaningful with command-line refspec(s).");
444 /* Use the defaults */
445 struct branch *branch = branch_get(NULL);
446 int has_merge = branch_has_merge_config(branch);
449 /* Note: has_merge implies non-NULL branch->remote_name */
450 (has_merge && !strcmp(branch->remote_name, remote->name)))) {
451 for (i = 0; i < remote->fetch.nr; i++) {
452 get_fetch_map(remote_refs, &remote->fetch.items[i], &tail, 0);
453 if (remote->fetch.items[i].dst &&
454 remote->fetch.items[i].dst[0])
456 if (!i && !has_merge && ref_map &&
457 !remote->fetch.items[0].pattern)
458 ref_map->fetch_head_status = FETCH_HEAD_MERGE;
461 * if the remote we're fetching from is the same
462 * as given in branch.<name>.remote, we add the
463 * ref given in branch.<name>.merge, too.
465 * Note: has_merge implies non-NULL branch->remote_name
468 !strcmp(branch->remote_name, remote->name))
469 add_merge_config(&ref_map, remote_refs, branch, &tail);
471 ref_map = get_remote_ref(remote_refs, "HEAD");
473 die(_("Couldn't find remote ref HEAD"));
474 ref_map->fetch_head_status = FETCH_HEAD_MERGE;
475 tail = &ref_map->next;
479 if (tags == TAGS_SET)
480 /* also fetch all tags */
481 get_fetch_map(remote_refs, tag_refspec, &tail, 0);
482 else if (tags == TAGS_DEFAULT && *autotags)
483 find_non_local_tags(remote_refs, &ref_map, &tail);
485 /* Now append any refs to be updated opportunistically: */
487 for (rm = orefs; rm; rm = rm->next) {
488 rm->fetch_head_status = FETCH_HEAD_IGNORE;
492 ref_map = ref_remove_duplicates(ref_map);
494 refname_hash_init(&existing_refs);
495 for_each_ref(add_one_refname, &existing_refs);
497 for (rm = ref_map; rm; rm = rm->next) {
499 const char *refname = rm->peer_ref->name;
500 struct refname_hash_entry *peer_item;
502 peer_item = hashmap_get_from_hash(&existing_refs,
506 struct object_id *old_oid = &peer_item->oid;
507 oidcpy(&rm->peer_ref->old_oid, old_oid);
511 hashmap_free(&existing_refs, 1);
516 #define STORE_REF_ERROR_OTHER 1
517 #define STORE_REF_ERROR_DF_CONFLICT 2
519 static int s_update_ref(const char *action,
524 char *rla = getenv("GIT_REFLOG_ACTION");
525 struct ref_transaction *transaction;
526 struct strbuf err = STRBUF_INIT;
527 int ret, df_conflict = 0;
532 rla = default_rla.buf;
533 msg = xstrfmt("%s: %s", rla, action);
535 transaction = ref_transaction_begin(&err);
537 ref_transaction_update(transaction, ref->name,
539 check_old ? &ref->old_oid : NULL,
543 ret = ref_transaction_commit(transaction, &err);
545 df_conflict = (ret == TRANSACTION_NAME_CONFLICT);
549 ref_transaction_free(transaction);
550 strbuf_release(&err);
554 ref_transaction_free(transaction);
555 error("%s", err.buf);
556 strbuf_release(&err);
558 return df_conflict ? STORE_REF_ERROR_DF_CONFLICT
559 : STORE_REF_ERROR_OTHER;
562 static int refcol_width = 10;
563 static int compact_format;
565 static void adjust_refcol_width(const struct ref *ref)
567 int max, rlen, llen, len;
569 /* uptodate lines are only shown on high verbosity level */
570 if (!verbosity && oideq(&ref->peer_ref->old_oid, &ref->old_oid))
573 max = term_columns();
574 rlen = utf8_strwidth(prettify_refname(ref->name));
576 llen = utf8_strwidth(prettify_refname(ref->peer_ref->name));
579 * rough estimation to see if the output line is too long and
580 * should not be counted (we can't do precise calculation
581 * anyway because we don't know if the error explanation part
582 * will be printed in update_local_ref)
584 if (compact_format) {
588 len = 21 /* flag and summary */ + rlen + 4 /* -> */ + llen;
593 * Not precise calculation for compact mode because '*' can
594 * appear on the left hand side of '->' and shrink the column
597 if (refcol_width < rlen)
601 static void prepare_format_display(struct ref *ref_map)
604 const char *format = "full";
606 git_config_get_string_const("fetch.output", &format);
607 if (!strcasecmp(format, "full"))
609 else if (!strcasecmp(format, "compact"))
612 die(_("configuration fetch.output contains invalid value %s"),
615 for (rm = ref_map; rm; rm = rm->next) {
616 if (rm->status == REF_STATUS_REJECT_SHALLOW ||
618 !strcmp(rm->name, "HEAD"))
621 adjust_refcol_width(rm);
625 static void print_remote_to_local(struct strbuf *display,
626 const char *remote, const char *local)
628 strbuf_addf(display, "%-*s -> %s", refcol_width, remote, local);
631 static int find_and_replace(struct strbuf *haystack,
633 const char *placeholder)
635 const char *p = strstr(haystack->buf, needle);
641 if (p > haystack->buf && p[-1] != '/')
645 nlen = strlen(needle);
646 if (plen > nlen && p[nlen] != '/')
649 strbuf_splice(haystack, p - haystack->buf, nlen,
650 placeholder, strlen(placeholder));
654 static void print_compact(struct strbuf *display,
655 const char *remote, const char *local)
657 struct strbuf r = STRBUF_INIT;
658 struct strbuf l = STRBUF_INIT;
660 if (!strcmp(remote, local)) {
661 strbuf_addf(display, "%-*s -> *", refcol_width, remote);
665 strbuf_addstr(&r, remote);
666 strbuf_addstr(&l, local);
668 if (!find_and_replace(&r, local, "*"))
669 find_and_replace(&l, remote, "*");
670 print_remote_to_local(display, r.buf, l.buf);
676 static void format_display(struct strbuf *display, char code,
677 const char *summary, const char *error,
678 const char *remote, const char *local,
681 int width = (summary_width + strlen(summary) - gettext_width(summary));
683 strbuf_addf(display, "%c %-*s ", code, width, summary);
685 print_remote_to_local(display, remote, local);
687 print_compact(display, remote, local);
689 strbuf_addf(display, " (%s)", error);
692 static int update_local_ref(struct ref *ref,
694 const struct ref *remote_ref,
695 struct strbuf *display,
698 struct commit *current = NULL, *updated;
699 enum object_type type;
700 struct branch *current_branch = branch_get(NULL);
701 const char *pretty_ref = prettify_refname(ref->name);
703 type = oid_object_info(the_repository, &ref->new_oid, NULL);
705 die(_("object %s not found"), oid_to_hex(&ref->new_oid));
707 if (oideq(&ref->old_oid, &ref->new_oid)) {
709 format_display(display, '=', _("[up to date]"), NULL,
710 remote, pretty_ref, summary_width);
714 if (current_branch &&
715 !strcmp(ref->name, current_branch->name) &&
716 !(update_head_ok || is_bare_repository()) &&
717 !is_null_oid(&ref->old_oid)) {
719 * If this is the head, and it's not okay to update
720 * the head, and the old value of the head isn't empty...
722 format_display(display, '!', _("[rejected]"),
723 _("can't fetch in current branch"),
724 remote, pretty_ref, summary_width);
728 if (!is_null_oid(&ref->old_oid) &&
729 starts_with(ref->name, "refs/tags/")) {
730 if (force || ref->force) {
732 r = s_update_ref("updating tag", ref, 0);
733 format_display(display, r ? '!' : 't', _("[tag update]"),
734 r ? _("unable to update local ref") : NULL,
735 remote, pretty_ref, summary_width);
738 format_display(display, '!', _("[rejected]"), _("would clobber existing tag"),
739 remote, pretty_ref, summary_width);
744 current = lookup_commit_reference_gently(the_repository,
746 updated = lookup_commit_reference_gently(the_repository,
748 if (!current || !updated) {
753 * Nicely describe the new ref we're fetching.
754 * Base this on the remote's ref name, as it's
755 * more likely to follow a standard layout.
757 const char *name = remote_ref ? remote_ref->name : "";
758 if (starts_with(name, "refs/tags/")) {
760 what = _("[new tag]");
761 } else if (starts_with(name, "refs/heads/")) {
762 msg = "storing head";
763 what = _("[new branch]");
766 what = _("[new ref]");
769 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
770 (recurse_submodules != RECURSE_SUBMODULES_ON))
771 check_for_new_submodule_commits(&ref->new_oid);
772 r = s_update_ref(msg, ref, 0);
773 format_display(display, r ? '!' : '*', what,
774 r ? _("unable to update local ref") : NULL,
775 remote, pretty_ref, summary_width);
779 if (in_merge_bases(current, updated)) {
780 struct strbuf quickref = STRBUF_INIT;
782 strbuf_add_unique_abbrev(&quickref, ¤t->object.oid, DEFAULT_ABBREV);
783 strbuf_addstr(&quickref, "..");
784 strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
785 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
786 (recurse_submodules != RECURSE_SUBMODULES_ON))
787 check_for_new_submodule_commits(&ref->new_oid);
788 r = s_update_ref("fast-forward", ref, 1);
789 format_display(display, r ? '!' : ' ', quickref.buf,
790 r ? _("unable to update local ref") : NULL,
791 remote, pretty_ref, summary_width);
792 strbuf_release(&quickref);
794 } else if (force || ref->force) {
795 struct strbuf quickref = STRBUF_INIT;
797 strbuf_add_unique_abbrev(&quickref, ¤t->object.oid, DEFAULT_ABBREV);
798 strbuf_addstr(&quickref, "...");
799 strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
800 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
801 (recurse_submodules != RECURSE_SUBMODULES_ON))
802 check_for_new_submodule_commits(&ref->new_oid);
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;
899 if (!strcmp(rm->name, "HEAD")) {
903 else if (starts_with(rm->name, "refs/heads/")) {
905 what = rm->name + 11;
907 else if (starts_with(rm->name, "refs/tags/")) {
909 what = rm->name + 10;
911 else if (starts_with(rm->name, "refs/remotes/")) {
912 kind = "remote-tracking branch";
913 what = rm->name + 13;
920 url_len = strlen(url);
921 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
924 if (4 < i && !strncmp(".git", url + i - 3, 4))
930 strbuf_addf(¬e, "%s ", kind);
931 strbuf_addf(¬e, "'%s' of ", what);
933 switch (rm->fetch_head_status) {
934 case FETCH_HEAD_NOT_FOR_MERGE:
935 merge_status_marker = "not-for-merge";
937 case FETCH_HEAD_MERGE:
938 fprintf(fp, "%s\t%s\t%s",
939 oid_to_hex(&rm->old_oid),
942 for (i = 0; i < url_len; ++i)
950 /* do not write anything to FETCH_HEAD */
956 rc |= update_local_ref(ref, what, rm, ¬e,
960 format_display(¬e, '*',
961 *kind ? kind : "branch", NULL,
962 *what ? what : "HEAD",
963 "FETCH_HEAD", summary_width);
965 if (verbosity >= 0 && !shown_url) {
966 fprintf(stderr, _("From %.*s\n"),
971 fprintf(stderr, " %s\n", note.buf);
976 if (rc & STORE_REF_ERROR_DF_CONFLICT)
977 error(_("some local refs could not be updated; try running\n"
978 " 'git remote prune %s' to remove any old, conflicting "
979 "branches"), remote_name);
982 strbuf_release(¬e);
989 * We would want to bypass the object transfer altogether if
990 * everything we are going to fetch already exists and is connected
993 static int quickfetch(struct ref *ref_map)
995 struct ref *rm = ref_map;
996 struct check_connected_options opt = CHECK_CONNECTED_INIT;
999 * If we are deepening a shallow clone we already have these
1000 * objects reachable. Running rev-list here will return with
1001 * a good (0) exit status and we'll bypass the fetch that we
1002 * really need to perform. Claiming failure now will ensure
1003 * we perform the network exchange to deepen our history.
1008 return check_connected(iterate_ref_map, &rm, &opt);
1011 static int fetch_refs(struct transport *transport, struct ref *ref_map)
1013 int ret = quickfetch(ref_map);
1015 ret = transport_fetch_refs(transport, ref_map);
1018 * Keep the new pack's ".keep" file around to allow the caller
1019 * time to update refs to reference the new objects.
1022 transport_unlock_pack(transport);
1026 /* Update local refs based on the ref values fetched from a remote */
1027 static int consume_refs(struct transport *transport, struct ref *ref_map)
1029 int connectivity_checked = transport->smart_options
1030 ? transport->smart_options->connectivity_checked : 0;
1031 int ret = store_updated_refs(transport->url,
1032 transport->remote->name,
1033 connectivity_checked,
1035 transport_unlock_pack(transport);
1039 static int prune_refs(struct refspec *rs, struct ref *ref_map,
1040 const char *raw_url)
1042 int url_len, i, result = 0;
1043 struct ref *ref, *stale_refs = get_stale_heads(rs, ref_map);
1045 int summary_width = transport_summary_width(stale_refs);
1046 const char *dangling_msg = dry_run
1047 ? _(" (%s will become dangling)")
1048 : _(" (%s has become dangling)");
1051 url = transport_anonymize_url(raw_url);
1053 url = xstrdup("foreign");
1055 url_len = strlen(url);
1056 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
1060 if (4 < i && !strncmp(".git", url + i - 3, 4))
1064 struct string_list refnames = STRING_LIST_INIT_NODUP;
1066 for (ref = stale_refs; ref; ref = ref->next)
1067 string_list_append(&refnames, ref->name);
1069 result = delete_refs("fetch: prune", &refnames, 0);
1070 string_list_clear(&refnames, 0);
1073 if (verbosity >= 0) {
1074 for (ref = stale_refs; ref; ref = ref->next) {
1075 struct strbuf sb = STRBUF_INIT;
1077 fprintf(stderr, _("From %.*s\n"), url_len, url);
1080 format_display(&sb, '-', _("[deleted]"), NULL,
1081 _("(none)"), prettify_refname(ref->name),
1083 fprintf(stderr, " %s\n",sb.buf);
1084 strbuf_release(&sb);
1085 warn_dangling_symref(stderr, dangling_msg, ref->name);
1090 free_refs(stale_refs);
1094 static void check_not_current_branch(struct ref *ref_map)
1096 struct branch *current_branch = branch_get(NULL);
1098 if (is_bare_repository() || !current_branch)
1101 for (; ref_map; ref_map = ref_map->next)
1102 if (ref_map->peer_ref && !strcmp(current_branch->refname,
1103 ref_map->peer_ref->name))
1104 die(_("Refusing to fetch into current branch %s "
1105 "of non-bare repository"), current_branch->refname);
1108 static int truncate_fetch_head(void)
1110 const char *filename = git_path_fetch_head(the_repository);
1111 FILE *fp = fopen_for_writing(filename);
1114 return error_errno(_("cannot open %s"), filename);
1119 static void set_option(struct transport *transport, const char *name, const char *value)
1121 int r = transport_set_option(transport, name, value);
1123 die(_("Option \"%s\" value \"%s\" is not valid for %s"),
1124 name, value, transport->url);
1126 warning(_("Option \"%s\" is ignored for %s\n"),
1127 name, transport->url);
1131 static int add_oid(const char *refname, const struct object_id *oid, int flags,
1134 struct oid_array *oids = cb_data;
1136 oid_array_append(oids, oid);
1140 static void add_negotiation_tips(struct git_transport_options *smart_options)
1142 struct oid_array *oids = xcalloc(1, sizeof(*oids));
1145 for (i = 0; i < negotiation_tip.nr; i++) {
1146 const char *s = negotiation_tip.items[i].string;
1148 if (!has_glob_specials(s)) {
1149 struct object_id oid;
1150 if (get_oid(s, &oid))
1151 die("%s is not a valid object", s);
1152 oid_array_append(oids, &oid);
1156 for_each_glob_ref(add_oid, s, oids);
1157 if (old_nr == oids->nr)
1158 warning("Ignoring --negotiation-tip=%s because it does not match any refs",
1161 smart_options->negotiation_tips = oids;
1164 static struct transport *prepare_transport(struct remote *remote, int deepen)
1166 struct transport *transport;
1167 transport = transport_get(remote, NULL);
1168 transport_set_verbosity(transport, verbosity, progress);
1169 transport->family = family;
1171 set_option(transport, TRANS_OPT_UPLOADPACK, upload_pack);
1173 set_option(transport, TRANS_OPT_KEEP, "yes");
1175 set_option(transport, TRANS_OPT_DEPTH, depth);
1176 if (deepen && deepen_since)
1177 set_option(transport, TRANS_OPT_DEEPEN_SINCE, deepen_since);
1178 if (deepen && deepen_not.nr)
1179 set_option(transport, TRANS_OPT_DEEPEN_NOT,
1180 (const char *)&deepen_not);
1181 if (deepen_relative)
1182 set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, "yes");
1184 set_option(transport, TRANS_OPT_UPDATE_SHALLOW, "yes");
1185 if (filter_options.choice) {
1186 set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER,
1187 filter_options.filter_spec);
1188 set_option(transport, TRANS_OPT_FROM_PROMISOR, "1");
1190 if (negotiation_tip.nr) {
1191 if (transport->smart_options)
1192 add_negotiation_tips(transport->smart_options);
1194 warning("Ignoring --negotiation-tip because the protocol does not support it.");
1199 static void backfill_tags(struct transport *transport, struct ref *ref_map)
1204 * Once we have set TRANS_OPT_DEEPEN_SINCE, we can't unset it
1205 * when remote helper is used (setting it to an empty string
1206 * is not unsetting). We could extend the remote helper
1207 * protocol for that, but for now, just force a new connection
1208 * without deepen-since. Similar story for deepen-not.
1210 cannot_reuse = transport->cannot_reuse ||
1211 deepen_since || deepen_not.nr;
1213 gsecondary = prepare_transport(transport->remote, 0);
1214 transport = gsecondary;
1217 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
1218 transport_set_option(transport, TRANS_OPT_DEPTH, "0");
1219 transport_set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, NULL);
1220 if (!fetch_refs(transport, ref_map))
1221 consume_refs(transport, ref_map);
1224 transport_disconnect(gsecondary);
1229 static int do_fetch(struct transport *transport,
1232 struct ref *ref_map;
1233 int autotags = (transport->remote->fetch_tags == 1);
1235 const struct ref *remote_refs;
1236 struct argv_array ref_prefixes = ARGV_ARRAY_INIT;
1238 if (tags == TAGS_DEFAULT) {
1239 if (transport->remote->fetch_tags == 2)
1241 if (transport->remote->fetch_tags == -1)
1245 /* if not appending, truncate FETCH_HEAD */
1246 if (!append && !dry_run) {
1247 retcode = truncate_fetch_head();
1253 refspec_ref_prefixes(rs, &ref_prefixes);
1254 else if (transport->remote && transport->remote->fetch.nr)
1255 refspec_ref_prefixes(&transport->remote->fetch, &ref_prefixes);
1257 if (ref_prefixes.argc &&
1258 (tags == TAGS_SET || (tags == TAGS_DEFAULT))) {
1259 argv_array_push(&ref_prefixes, "refs/tags/");
1262 remote_refs = transport_get_remote_refs(transport, &ref_prefixes);
1263 argv_array_clear(&ref_prefixes);
1265 ref_map = get_ref_map(transport->remote, remote_refs, rs,
1267 if (!update_head_ok)
1268 check_not_current_branch(ref_map);
1270 if (tags == TAGS_DEFAULT && autotags)
1271 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
1274 * We only prune based on refspecs specified
1275 * explicitly (via command line or configuration); we
1276 * don't care whether --tags was specified.
1279 prune_refs(rs, ref_map, transport->url);
1281 prune_refs(&transport->remote->fetch,
1286 if (fetch_refs(transport, ref_map) || consume_refs(transport, ref_map)) {
1293 /* if neither --no-tags nor --tags was specified, do automated tag
1295 if (tags == TAGS_DEFAULT && autotags) {
1296 struct ref **tail = &ref_map;
1298 find_non_local_tags(remote_refs, &ref_map, &tail);
1300 backfill_tags(transport, ref_map);
1308 static int get_one_remote_for_fetch(struct remote *remote, void *priv)
1310 struct string_list *list = priv;
1311 if (!remote->skip_default_update)
1312 string_list_append(list, remote->name);
1316 struct remote_group_data {
1318 struct string_list *list;
1321 static int get_remote_group(const char *key, const char *value, void *priv)
1323 struct remote_group_data *g = priv;
1325 if (skip_prefix(key, "remotes.", &key) && !strcmp(key, g->name)) {
1326 /* split list by white space */
1328 size_t wordlen = strcspn(value, " \t\n");
1331 string_list_append_nodup(g->list,
1332 xstrndup(value, wordlen));
1333 value += wordlen + (value[wordlen] != '\0');
1340 static int add_remote_or_group(const char *name, struct string_list *list)
1342 int prev_nr = list->nr;
1343 struct remote_group_data g;
1344 g.name = name; g.list = list;
1346 git_config(get_remote_group, &g);
1347 if (list->nr == prev_nr) {
1348 struct remote *remote = remote_get(name);
1349 if (!remote_is_configured(remote, 0))
1351 string_list_append(list, remote->name);
1356 static void add_options_to_argv(struct argv_array *argv)
1359 argv_array_push(argv, "--dry-run");
1361 argv_array_push(argv, prune ? "--prune" : "--no-prune");
1362 if (prune_tags != -1)
1363 argv_array_push(argv, prune_tags ? "--prune-tags" : "--no-prune-tags");
1365 argv_array_push(argv, "--update-head-ok");
1367 argv_array_push(argv, "--force");
1369 argv_array_push(argv, "--keep");
1370 if (recurse_submodules == RECURSE_SUBMODULES_ON)
1371 argv_array_push(argv, "--recurse-submodules");
1372 else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND)
1373 argv_array_push(argv, "--recurse-submodules=on-demand");
1374 if (tags == TAGS_SET)
1375 argv_array_push(argv, "--tags");
1376 else if (tags == TAGS_UNSET)
1377 argv_array_push(argv, "--no-tags");
1379 argv_array_push(argv, "-v");
1381 argv_array_push(argv, "-v");
1382 else if (verbosity < 0)
1383 argv_array_push(argv, "-q");
1387 static int fetch_multiple(struct string_list *list)
1390 struct argv_array argv = ARGV_ARRAY_INIT;
1392 if (!append && !dry_run) {
1393 int errcode = truncate_fetch_head();
1398 argv_array_pushl(&argv, "fetch", "--append", NULL);
1399 add_options_to_argv(&argv);
1401 for (i = 0; i < list->nr; i++) {
1402 const char *name = list->items[i].string;
1403 argv_array_push(&argv, name);
1405 printf(_("Fetching %s\n"), name);
1406 if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
1407 error(_("Could not fetch %s"), name);
1410 argv_array_pop(&argv);
1413 argv_array_clear(&argv);
1418 * Fetching from the promisor remote should use the given filter-spec
1419 * or inherit the default filter-spec from the config.
1421 static inline void fetch_one_setup_partial(struct remote *remote)
1424 * Explicit --no-filter argument overrides everything, regardless
1425 * of any prior partial clones and fetches.
1427 if (filter_options.no_filter)
1431 * If no prior partial clone/fetch and the current fetch DID NOT
1432 * request a partial-fetch, do a normal fetch.
1434 if (!repository_format_partial_clone && !filter_options.choice)
1438 * If this is the FIRST partial-fetch request, we enable partial
1439 * on this repo and remember the given filter-spec as the default
1440 * for subsequent fetches to this remote.
1442 if (!repository_format_partial_clone && filter_options.choice) {
1443 partial_clone_register(remote->name, &filter_options);
1448 * We are currently limited to only ONE promisor remote and only
1449 * allow partial-fetches from the promisor remote.
1451 if (strcmp(remote->name, repository_format_partial_clone)) {
1452 if (filter_options.choice)
1453 die(_("--filter can only be used with the remote configured in core.partialClone"));
1458 * Do a partial-fetch from the promisor remote using either the
1459 * explicitly given filter-spec or inherit the filter-spec from
1462 if (!filter_options.choice)
1463 partial_clone_get_default_filter_spec(&filter_options);
1467 static int fetch_one(struct remote *remote, int argc, const char **argv, int prune_tags_ok)
1469 struct refspec rs = REFSPEC_INIT_FETCH;
1472 int maybe_prune_tags;
1473 int remote_via_config = remote_is_configured(remote, 0);
1476 die(_("No remote repository specified. Please, specify either a URL or a\n"
1477 "remote name from which new revisions should be fetched."));
1479 gtransport = prepare_transport(remote, 1);
1482 /* no command line request */
1483 if (0 <= remote->prune)
1484 prune = remote->prune;
1485 else if (0 <= fetch_prune_config)
1486 prune = fetch_prune_config;
1488 prune = PRUNE_BY_DEFAULT;
1491 if (prune_tags < 0) {
1492 /* no command line request */
1493 if (0 <= remote->prune_tags)
1494 prune_tags = remote->prune_tags;
1495 else if (0 <= fetch_prune_tags_config)
1496 prune_tags = fetch_prune_tags_config;
1498 prune_tags = PRUNE_TAGS_BY_DEFAULT;
1501 maybe_prune_tags = prune_tags_ok && prune_tags;
1502 if (maybe_prune_tags && remote_via_config)
1503 refspec_append(&remote->fetch, TAG_REFSPEC);
1505 if (maybe_prune_tags && (argc || !remote_via_config))
1506 refspec_append(&rs, TAG_REFSPEC);
1508 for (i = 0; i < argc; i++) {
1509 if (!strcmp(argv[i], "tag")) {
1513 die(_("You need to specify a tag name."));
1515 tag = xstrfmt("refs/tags/%s:refs/tags/%s",
1517 refspec_append(&rs, tag);
1520 refspec_append(&rs, argv[i]);
1524 if (server_options.nr)
1525 gtransport->server_options = &server_options;
1527 sigchain_push_common(unlock_pack_on_signal);
1528 atexit(unlock_pack);
1529 exit_code = do_fetch(gtransport, &rs);
1531 transport_disconnect(gtransport);
1536 int cmd_fetch(int argc, const char **argv, const char *prefix)
1539 struct string_list list = STRING_LIST_INIT_DUP;
1540 struct remote *remote = NULL;
1542 int prune_tags_ok = 1;
1543 struct argv_array argv_gc_auto = ARGV_ARRAY_INIT;
1545 packet_trace_identity("fetch");
1547 fetch_if_missing = 0;
1549 /* Record the command line for the reflog */
1550 strbuf_addstr(&default_rla, "fetch");
1551 for (i = 1; i < argc; i++)
1552 strbuf_addf(&default_rla, " %s", argv[i]);
1554 fetch_config_from_gitmodules(&max_children, &recurse_submodules);
1555 git_config(git_fetch_config, NULL);
1557 argc = parse_options(argc, argv, prefix,
1558 builtin_fetch_options, builtin_fetch_usage, 0);
1560 if (deepen_relative) {
1561 if (deepen_relative < 0)
1562 die(_("Negative depth in --deepen is not supported"));
1564 die(_("--deepen and --depth are mutually exclusive"));
1565 depth = xstrfmt("%d", deepen_relative);
1569 die(_("--depth and --unshallow cannot be used together"));
1570 else if (!is_repository_shallow(the_repository))
1571 die(_("--unshallow on a complete repository does not make sense"));
1573 depth = xstrfmt("%d", INFINITE_DEPTH);
1576 /* no need to be strict, transport_set_option() will validate it again */
1577 if (depth && atoi(depth) < 1)
1578 die(_("depth %s is not a positive number"), depth);
1579 if (depth || deepen_since || deepen_not.nr)
1582 if (filter_options.choice && !repository_format_partial_clone)
1583 die("--filter can only be used when extensions.partialClone is set");
1587 die(_("fetch --all does not take a repository argument"));
1589 die(_("fetch --all does not make sense with refspecs"));
1590 (void) for_each_remote(get_one_remote_for_fetch, &list);
1591 } else if (argc == 0) {
1592 /* No arguments -- use default remote */
1593 remote = remote_get(NULL);
1594 } else if (multiple) {
1595 /* All arguments are assumed to be remotes or groups */
1596 for (i = 0; i < argc; i++)
1597 if (!add_remote_or_group(argv[i], &list))
1598 die(_("No such remote or remote group: %s"), argv[i]);
1600 /* Single remote or group */
1601 (void) add_remote_or_group(argv[0], &list);
1603 /* More than one remote */
1605 die(_("Fetching a group and specifying refspecs does not make sense"));
1607 /* Zero or one remotes */
1608 remote = remote_get(argv[0]);
1609 prune_tags_ok = (argc == 1);
1616 if (filter_options.choice || repository_format_partial_clone)
1617 fetch_one_setup_partial(remote);
1618 result = fetch_one(remote, argc, argv, prune_tags_ok);
1620 if (filter_options.choice)
1621 die(_("--filter can only be used with the remote configured in core.partialClone"));
1622 /* TODO should this also die if we have a previous partial-clone? */
1623 result = fetch_multiple(&list);
1626 if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
1627 struct argv_array options = ARGV_ARRAY_INIT;
1629 add_options_to_argv(&options);
1630 result = fetch_populated_submodules(the_repository,
1634 recurse_submodules_default,
1637 argv_array_clear(&options);
1640 string_list_clear(&list, 0);
1642 close_all_packs(the_repository->objects);
1644 argv_array_pushl(&argv_gc_auto, "gc", "--auto", NULL);
1646 argv_array_push(&argv_gc_auto, "--quiet");
1647 run_command_v_opt(argv_gc_auto.argv, RUN_GIT_CMD);
1648 argv_array_clear(&argv_gc_auto);