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;
242 char refname[FLEX_ARRAY];
245 static int refname_hash_entry_cmp(const void *hashmap_cmp_fn_data,
250 const struct refname_hash_entry *e1 = e1_;
251 const struct refname_hash_entry *e2 = e2_;
253 return strcmp(e1->refname, keydata ? keydata : e2->refname);
256 static struct refname_hash_entry *refname_hash_add(struct hashmap *map,
258 const struct object_id *oid)
260 struct refname_hash_entry *ent;
261 size_t len = strlen(refname);
263 FLEX_ALLOC_MEM(ent, refname, refname, len);
264 hashmap_entry_init(ent, strhash(refname));
265 oidcpy(&ent->oid, oid);
266 hashmap_add(map, ent);
270 static int add_one_refname(const char *refname,
271 const struct object_id *oid,
272 int flag, void *cbdata)
274 struct hashmap *refname_map = cbdata;
276 (void) refname_hash_add(refname_map, refname, oid);
280 static void refname_hash_init(struct hashmap *map)
282 hashmap_init(map, refname_hash_entry_cmp, NULL, 0);
285 static int refname_hash_exists(struct hashmap *map, const char *refname)
287 return !!hashmap_get_from_hash(map, strhash(refname), refname);
290 static void find_non_local_tags(const struct ref *refs,
294 struct hashmap existing_refs;
295 struct hashmap remote_refs;
296 struct string_list remote_refs_list = STRING_LIST_INIT_NODUP;
297 struct string_list_item *remote_ref_item;
298 const struct ref *ref;
299 struct refname_hash_entry *item = NULL;
301 refname_hash_init(&existing_refs);
302 refname_hash_init(&remote_refs);
304 for_each_ref(add_one_refname, &existing_refs);
305 for (ref = refs; ref; ref = ref->next) {
306 if (!starts_with(ref->name, "refs/tags/"))
310 * The peeled ref always follows the matching base
311 * ref, so if we see a peeled ref that we don't want
312 * to fetch then we can mark the ref entry in the list
313 * as one to ignore by setting util to NULL.
315 if (ends_with(ref->name, "^{}")) {
317 !has_object_file_with_flags(&ref->old_oid,
318 OBJECT_INFO_QUICK) &&
319 !will_fetch(head, ref->old_oid.hash) &&
320 !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) &&
321 !will_fetch(head, item->oid.hash))
328 * If item is non-NULL here, then we previously saw a
329 * ref not followed by a peeled reference, so we need
330 * to check if it is a lightweight tag that we want to
334 !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) &&
335 !will_fetch(head, item->oid.hash))
340 /* skip duplicates and refs that we already have */
341 if (refname_hash_exists(&remote_refs, ref->name) ||
342 refname_hash_exists(&existing_refs, ref->name))
345 item = refname_hash_add(&remote_refs, ref->name, &ref->old_oid);
346 string_list_insert(&remote_refs_list, ref->name);
348 hashmap_free(&existing_refs, 1);
351 * We may have a final lightweight tag that needs to be
352 * checked to see if it needs fetching.
355 !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) &&
356 !will_fetch(head, item->oid.hash))
360 * For all the tags in the remote_refs_list,
361 * add them to the list of refs to be fetched
363 for_each_string_list_item(remote_ref_item, &remote_refs_list) {
364 const char *refname = remote_ref_item->string;
366 item = hashmap_get_from_hash(&remote_refs, strhash(refname), refname);
368 BUG("unseen remote ref?");
370 /* Unless we have already decided to ignore this item... */
371 if (!is_null_oid(&item->oid)) {
372 struct ref *rm = alloc_ref(item->refname);
373 rm->peer_ref = alloc_ref(item->refname);
374 oidcpy(&rm->old_oid, &item->oid);
379 hashmap_free(&remote_refs, 1);
380 string_list_clear(&remote_refs_list, 0);
383 static struct ref *get_ref_map(struct remote *remote,
384 const struct ref *remote_refs,
386 int tags, int *autotags)
390 struct ref *ref_map = NULL;
391 struct ref **tail = &ref_map;
393 /* opportunistically-updated references: */
394 struct ref *orefs = NULL, **oref_tail = &orefs;
396 struct hashmap existing_refs;
399 struct refspec *fetch_refspec;
401 for (i = 0; i < rs->nr; i++) {
402 get_fetch_map(remote_refs, &rs->items[i], &tail, 0);
403 if (rs->items[i].dst && rs->items[i].dst[0])
406 /* Merge everything on the command line (but not --tags) */
407 for (rm = ref_map; rm; rm = rm->next)
408 rm->fetch_head_status = FETCH_HEAD_MERGE;
411 * For any refs that we happen to be fetching via
412 * command-line arguments, the destination ref might
413 * have been missing or have been different than the
414 * remote-tracking ref that would be derived from the
415 * configured refspec. In these cases, we want to
416 * take the opportunity to update their configured
417 * remote-tracking reference. However, we do not want
418 * to mention these entries in FETCH_HEAD at all, as
419 * they would simply be duplicates of existing
420 * entries, so we set them FETCH_HEAD_IGNORE below.
422 * We compute these entries now, based only on the
423 * refspecs specified on the command line. But we add
424 * them to the list following the refspecs resulting
425 * from the tags option so that one of the latter,
426 * which has FETCH_HEAD_NOT_FOR_MERGE, is not removed
427 * by ref_remove_duplicates() in favor of one of these
428 * opportunistic entries with FETCH_HEAD_IGNORE.
431 fetch_refspec = &refmap;
433 fetch_refspec = &remote->fetch;
435 for (i = 0; i < fetch_refspec->nr; i++)
436 get_fetch_map(ref_map, &fetch_refspec->items[i], &oref_tail, 1);
437 } else if (refmap.nr) {
438 die("--refmap option is only meaningful with command-line refspec(s).");
440 /* Use the defaults */
441 struct branch *branch = branch_get(NULL);
442 int has_merge = branch_has_merge_config(branch);
445 /* Note: has_merge implies non-NULL branch->remote_name */
446 (has_merge && !strcmp(branch->remote_name, remote->name)))) {
447 for (i = 0; i < remote->fetch.nr; i++) {
448 get_fetch_map(remote_refs, &remote->fetch.items[i], &tail, 0);
449 if (remote->fetch.items[i].dst &&
450 remote->fetch.items[i].dst[0])
452 if (!i && !has_merge && ref_map &&
453 !remote->fetch.items[0].pattern)
454 ref_map->fetch_head_status = FETCH_HEAD_MERGE;
457 * if the remote we're fetching from is the same
458 * as given in branch.<name>.remote, we add the
459 * ref given in branch.<name>.merge, too.
461 * Note: has_merge implies non-NULL branch->remote_name
464 !strcmp(branch->remote_name, remote->name))
465 add_merge_config(&ref_map, remote_refs, branch, &tail);
467 ref_map = get_remote_ref(remote_refs, "HEAD");
469 die(_("Couldn't find remote ref HEAD"));
470 ref_map->fetch_head_status = FETCH_HEAD_MERGE;
471 tail = &ref_map->next;
475 if (tags == TAGS_SET)
476 /* also fetch all tags */
477 get_fetch_map(remote_refs, tag_refspec, &tail, 0);
478 else if (tags == TAGS_DEFAULT && *autotags)
479 find_non_local_tags(remote_refs, &ref_map, &tail);
481 /* Now append any refs to be updated opportunistically: */
483 for (rm = orefs; rm; rm = rm->next) {
484 rm->fetch_head_status = FETCH_HEAD_IGNORE;
488 ref_map = ref_remove_duplicates(ref_map);
490 refname_hash_init(&existing_refs);
491 for_each_ref(add_one_refname, &existing_refs);
493 for (rm = ref_map; rm; rm = rm->next) {
495 const char *refname = rm->peer_ref->name;
496 struct refname_hash_entry *peer_item;
498 peer_item = hashmap_get_from_hash(&existing_refs,
502 struct object_id *old_oid = &peer_item->oid;
503 oidcpy(&rm->peer_ref->old_oid, old_oid);
507 hashmap_free(&existing_refs, 1);
512 #define STORE_REF_ERROR_OTHER 1
513 #define STORE_REF_ERROR_DF_CONFLICT 2
515 static int s_update_ref(const char *action,
520 char *rla = getenv("GIT_REFLOG_ACTION");
521 struct ref_transaction *transaction;
522 struct strbuf err = STRBUF_INIT;
523 int ret, df_conflict = 0;
528 rla = default_rla.buf;
529 msg = xstrfmt("%s: %s", rla, action);
531 transaction = ref_transaction_begin(&err);
533 ref_transaction_update(transaction, ref->name,
535 check_old ? &ref->old_oid : NULL,
539 ret = ref_transaction_commit(transaction, &err);
541 df_conflict = (ret == TRANSACTION_NAME_CONFLICT);
545 ref_transaction_free(transaction);
546 strbuf_release(&err);
550 ref_transaction_free(transaction);
551 error("%s", err.buf);
552 strbuf_release(&err);
554 return df_conflict ? STORE_REF_ERROR_DF_CONFLICT
555 : STORE_REF_ERROR_OTHER;
558 static int refcol_width = 10;
559 static int compact_format;
561 static void adjust_refcol_width(const struct ref *ref)
563 int max, rlen, llen, len;
565 /* uptodate lines are only shown on high verbosity level */
566 if (!verbosity && oideq(&ref->peer_ref->old_oid, &ref->old_oid))
569 max = term_columns();
570 rlen = utf8_strwidth(prettify_refname(ref->name));
572 llen = utf8_strwidth(prettify_refname(ref->peer_ref->name));
575 * rough estimation to see if the output line is too long and
576 * should not be counted (we can't do precise calculation
577 * anyway because we don't know if the error explanation part
578 * will be printed in update_local_ref)
580 if (compact_format) {
584 len = 21 /* flag and summary */ + rlen + 4 /* -> */ + llen;
589 * Not precise calculation for compact mode because '*' can
590 * appear on the left hand side of '->' and shrink the column
593 if (refcol_width < rlen)
597 static void prepare_format_display(struct ref *ref_map)
600 const char *format = "full";
602 git_config_get_string_const("fetch.output", &format);
603 if (!strcasecmp(format, "full"))
605 else if (!strcasecmp(format, "compact"))
608 die(_("configuration fetch.output contains invalid value %s"),
611 for (rm = ref_map; rm; rm = rm->next) {
612 if (rm->status == REF_STATUS_REJECT_SHALLOW ||
614 !strcmp(rm->name, "HEAD"))
617 adjust_refcol_width(rm);
621 static void print_remote_to_local(struct strbuf *display,
622 const char *remote, const char *local)
624 strbuf_addf(display, "%-*s -> %s", refcol_width, remote, local);
627 static int find_and_replace(struct strbuf *haystack,
629 const char *placeholder)
631 const char *p = strstr(haystack->buf, needle);
637 if (p > haystack->buf && p[-1] != '/')
641 nlen = strlen(needle);
642 if (plen > nlen && p[nlen] != '/')
645 strbuf_splice(haystack, p - haystack->buf, nlen,
646 placeholder, strlen(placeholder));
650 static void print_compact(struct strbuf *display,
651 const char *remote, const char *local)
653 struct strbuf r = STRBUF_INIT;
654 struct strbuf l = STRBUF_INIT;
656 if (!strcmp(remote, local)) {
657 strbuf_addf(display, "%-*s -> *", refcol_width, remote);
661 strbuf_addstr(&r, remote);
662 strbuf_addstr(&l, local);
664 if (!find_and_replace(&r, local, "*"))
665 find_and_replace(&l, remote, "*");
666 print_remote_to_local(display, r.buf, l.buf);
672 static void format_display(struct strbuf *display, char code,
673 const char *summary, const char *error,
674 const char *remote, const char *local,
677 int width = (summary_width + strlen(summary) - gettext_width(summary));
679 strbuf_addf(display, "%c %-*s ", code, width, summary);
681 print_remote_to_local(display, remote, local);
683 print_compact(display, remote, local);
685 strbuf_addf(display, " (%s)", error);
688 static int update_local_ref(struct ref *ref,
690 const struct ref *remote_ref,
691 struct strbuf *display,
694 struct commit *current = NULL, *updated;
695 enum object_type type;
696 struct branch *current_branch = branch_get(NULL);
697 const char *pretty_ref = prettify_refname(ref->name);
699 type = oid_object_info(the_repository, &ref->new_oid, NULL);
701 die(_("object %s not found"), oid_to_hex(&ref->new_oid));
703 if (oideq(&ref->old_oid, &ref->new_oid)) {
705 format_display(display, '=', _("[up to date]"), NULL,
706 remote, pretty_ref, summary_width);
710 if (current_branch &&
711 !strcmp(ref->name, current_branch->name) &&
712 !(update_head_ok || is_bare_repository()) &&
713 !is_null_oid(&ref->old_oid)) {
715 * If this is the head, and it's not okay to update
716 * the head, and the old value of the head isn't empty...
718 format_display(display, '!', _("[rejected]"),
719 _("can't fetch in current branch"),
720 remote, pretty_ref, summary_width);
724 if (!is_null_oid(&ref->old_oid) &&
725 starts_with(ref->name, "refs/tags/")) {
726 if (force || ref->force) {
728 r = s_update_ref("updating tag", ref, 0);
729 format_display(display, r ? '!' : 't', _("[tag update]"),
730 r ? _("unable to update local ref") : NULL,
731 remote, pretty_ref, summary_width);
734 format_display(display, '!', _("[rejected]"), _("would clobber existing tag"),
735 remote, pretty_ref, summary_width);
740 current = lookup_commit_reference_gently(the_repository,
742 updated = lookup_commit_reference_gently(the_repository,
744 if (!current || !updated) {
749 * Nicely describe the new ref we're fetching.
750 * Base this on the remote's ref name, as it's
751 * more likely to follow a standard layout.
753 const char *name = remote_ref ? remote_ref->name : "";
754 if (starts_with(name, "refs/tags/")) {
756 what = _("[new tag]");
757 } else if (starts_with(name, "refs/heads/")) {
758 msg = "storing head";
759 what = _("[new branch]");
762 what = _("[new ref]");
765 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
766 (recurse_submodules != RECURSE_SUBMODULES_ON))
767 check_for_new_submodule_commits(&ref->new_oid);
768 r = s_update_ref(msg, ref, 0);
769 format_display(display, r ? '!' : '*', what,
770 r ? _("unable to update local ref") : NULL,
771 remote, pretty_ref, summary_width);
775 if (in_merge_bases(current, updated)) {
776 struct strbuf quickref = STRBUF_INIT;
778 strbuf_add_unique_abbrev(&quickref, ¤t->object.oid, DEFAULT_ABBREV);
779 strbuf_addstr(&quickref, "..");
780 strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
781 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
782 (recurse_submodules != RECURSE_SUBMODULES_ON))
783 check_for_new_submodule_commits(&ref->new_oid);
784 r = s_update_ref("fast-forward", ref, 1);
785 format_display(display, r ? '!' : ' ', quickref.buf,
786 r ? _("unable to update local ref") : NULL,
787 remote, pretty_ref, summary_width);
788 strbuf_release(&quickref);
790 } else if (force || ref->force) {
791 struct strbuf quickref = STRBUF_INIT;
793 strbuf_add_unique_abbrev(&quickref, ¤t->object.oid, DEFAULT_ABBREV);
794 strbuf_addstr(&quickref, "...");
795 strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
796 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
797 (recurse_submodules != RECURSE_SUBMODULES_ON))
798 check_for_new_submodule_commits(&ref->new_oid);
799 r = s_update_ref("forced-update", ref, 1);
800 format_display(display, r ? '!' : '+', quickref.buf,
801 r ? _("unable to update local ref") : _("forced update"),
802 remote, pretty_ref, summary_width);
803 strbuf_release(&quickref);
806 format_display(display, '!', _("[rejected]"), _("non-fast-forward"),
807 remote, pretty_ref, summary_width);
812 static int iterate_ref_map(void *cb_data, struct object_id *oid)
814 struct ref **rm = cb_data;
815 struct ref *ref = *rm;
817 while (ref && ref->status == REF_STATUS_REJECT_SHALLOW)
820 return -1; /* end of the list */
822 oidcpy(oid, &ref->old_oid);
826 static int store_updated_refs(const char *raw_url, const char *remote_name,
827 int connectivity_checked, struct ref *ref_map)
830 struct commit *commit;
831 int url_len, i, rc = 0;
832 struct strbuf note = STRBUF_INIT;
833 const char *what, *kind;
836 const char *filename = dry_run ? "/dev/null" : git_path_fetch_head(the_repository);
838 int summary_width = transport_summary_width(ref_map);
840 fp = fopen(filename, "a");
842 return error_errno(_("cannot open %s"), filename);
845 url = transport_anonymize_url(raw_url);
847 url = xstrdup("foreign");
849 if (!connectivity_checked) {
851 if (check_connected(iterate_ref_map, &rm, NULL)) {
852 rc = error(_("%s did not send all necessary objects\n"), url);
857 prepare_format_display(ref_map);
860 * We do a pass for each fetch_head_status type in their enum order, so
861 * merged entries are written before not-for-merge. That lets readers
862 * use FETCH_HEAD as a refname to refer to the ref to be merged.
864 for (want_status = FETCH_HEAD_MERGE;
865 want_status <= FETCH_HEAD_IGNORE;
867 for (rm = ref_map; rm; rm = rm->next) {
868 struct ref *ref = NULL;
869 const char *merge_status_marker = "";
871 if (rm->status == REF_STATUS_REJECT_SHALLOW) {
872 if (want_status == FETCH_HEAD_MERGE)
873 warning(_("reject %s because shallow roots are not allowed to be updated"),
874 rm->peer_ref ? rm->peer_ref->name : rm->name);
878 commit = lookup_commit_reference_gently(the_repository,
882 rm->fetch_head_status = FETCH_HEAD_NOT_FOR_MERGE;
884 if (rm->fetch_head_status != want_status)
888 ref = alloc_ref(rm->peer_ref->name);
889 oidcpy(&ref->old_oid, &rm->peer_ref->old_oid);
890 oidcpy(&ref->new_oid, &rm->old_oid);
891 ref->force = rm->peer_ref->force;
895 if (!strcmp(rm->name, "HEAD")) {
899 else if (starts_with(rm->name, "refs/heads/")) {
901 what = rm->name + 11;
903 else if (starts_with(rm->name, "refs/tags/")) {
905 what = rm->name + 10;
907 else if (starts_with(rm->name, "refs/remotes/")) {
908 kind = "remote-tracking branch";
909 what = rm->name + 13;
916 url_len = strlen(url);
917 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
920 if (4 < i && !strncmp(".git", url + i - 3, 4))
926 strbuf_addf(¬e, "%s ", kind);
927 strbuf_addf(¬e, "'%s' of ", what);
929 switch (rm->fetch_head_status) {
930 case FETCH_HEAD_NOT_FOR_MERGE:
931 merge_status_marker = "not-for-merge";
933 case FETCH_HEAD_MERGE:
934 fprintf(fp, "%s\t%s\t%s",
935 oid_to_hex(&rm->old_oid),
938 for (i = 0; i < url_len; ++i)
946 /* do not write anything to FETCH_HEAD */
952 rc |= update_local_ref(ref, what, rm, ¬e,
956 format_display(¬e, '*',
957 *kind ? kind : "branch", NULL,
958 *what ? what : "HEAD",
959 "FETCH_HEAD", summary_width);
961 if (verbosity >= 0 && !shown_url) {
962 fprintf(stderr, _("From %.*s\n"),
967 fprintf(stderr, " %s\n", note.buf);
972 if (rc & STORE_REF_ERROR_DF_CONFLICT)
973 error(_("some local refs could not be updated; try running\n"
974 " 'git remote prune %s' to remove any old, conflicting "
975 "branches"), remote_name);
978 strbuf_release(¬e);
985 * We would want to bypass the object transfer altogether if
986 * everything we are going to fetch already exists and is connected
989 static int check_exist_and_connected(struct ref *ref_map)
991 struct ref *rm = ref_map;
992 struct check_connected_options opt = CHECK_CONNECTED_INIT;
996 * If we are deepening a shallow clone we already have these
997 * objects reachable. Running rev-list here will return with
998 * a good (0) exit status and we'll bypass the fetch that we
999 * really need to perform. Claiming failure now will ensure
1000 * we perform the network exchange to deepen our history.
1006 * check_connected() allows objects to merely be promised, but
1007 * we need all direct targets to exist.
1009 for (r = rm; r; r = r->next) {
1010 if (!has_object_file(&r->old_oid))
1015 return check_connected(iterate_ref_map, &rm, &opt);
1018 static int fetch_refs(struct transport *transport, struct ref *ref_map)
1020 int ret = check_exist_and_connected(ref_map);
1022 ret = transport_fetch_refs(transport, ref_map);
1025 * Keep the new pack's ".keep" file around to allow the caller
1026 * time to update refs to reference the new objects.
1029 transport_unlock_pack(transport);
1033 /* Update local refs based on the ref values fetched from a remote */
1034 static int consume_refs(struct transport *transport, struct ref *ref_map)
1036 int connectivity_checked = transport->smart_options
1037 ? transport->smart_options->connectivity_checked : 0;
1038 int ret = store_updated_refs(transport->url,
1039 transport->remote->name,
1040 connectivity_checked,
1042 transport_unlock_pack(transport);
1046 static int prune_refs(struct refspec *rs, struct ref *ref_map,
1047 const char *raw_url)
1049 int url_len, i, result = 0;
1050 struct ref *ref, *stale_refs = get_stale_heads(rs, ref_map);
1052 int summary_width = transport_summary_width(stale_refs);
1053 const char *dangling_msg = dry_run
1054 ? _(" (%s will become dangling)")
1055 : _(" (%s has become dangling)");
1058 url = transport_anonymize_url(raw_url);
1060 url = xstrdup("foreign");
1062 url_len = strlen(url);
1063 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
1067 if (4 < i && !strncmp(".git", url + i - 3, 4))
1071 struct string_list refnames = STRING_LIST_INIT_NODUP;
1073 for (ref = stale_refs; ref; ref = ref->next)
1074 string_list_append(&refnames, ref->name);
1076 result = delete_refs("fetch: prune", &refnames, 0);
1077 string_list_clear(&refnames, 0);
1080 if (verbosity >= 0) {
1081 for (ref = stale_refs; ref; ref = ref->next) {
1082 struct strbuf sb = STRBUF_INIT;
1084 fprintf(stderr, _("From %.*s\n"), url_len, url);
1087 format_display(&sb, '-', _("[deleted]"), NULL,
1088 _("(none)"), prettify_refname(ref->name),
1090 fprintf(stderr, " %s\n",sb.buf);
1091 strbuf_release(&sb);
1092 warn_dangling_symref(stderr, dangling_msg, ref->name);
1097 free_refs(stale_refs);
1101 static void check_not_current_branch(struct ref *ref_map)
1103 struct branch *current_branch = branch_get(NULL);
1105 if (is_bare_repository() || !current_branch)
1108 for (; ref_map; ref_map = ref_map->next)
1109 if (ref_map->peer_ref && !strcmp(current_branch->refname,
1110 ref_map->peer_ref->name))
1111 die(_("Refusing to fetch into current branch %s "
1112 "of non-bare repository"), current_branch->refname);
1115 static int truncate_fetch_head(void)
1117 const char *filename = git_path_fetch_head(the_repository);
1118 FILE *fp = fopen_for_writing(filename);
1121 return error_errno(_("cannot open %s"), filename);
1126 static void set_option(struct transport *transport, const char *name, const char *value)
1128 int r = transport_set_option(transport, name, value);
1130 die(_("Option \"%s\" value \"%s\" is not valid for %s"),
1131 name, value, transport->url);
1133 warning(_("Option \"%s\" is ignored for %s\n"),
1134 name, transport->url);
1138 static int add_oid(const char *refname, const struct object_id *oid, int flags,
1141 struct oid_array *oids = cb_data;
1143 oid_array_append(oids, oid);
1147 static void add_negotiation_tips(struct git_transport_options *smart_options)
1149 struct oid_array *oids = xcalloc(1, sizeof(*oids));
1152 for (i = 0; i < negotiation_tip.nr; i++) {
1153 const char *s = negotiation_tip.items[i].string;
1155 if (!has_glob_specials(s)) {
1156 struct object_id oid;
1157 if (get_oid(s, &oid))
1158 die("%s is not a valid object", s);
1159 oid_array_append(oids, &oid);
1163 for_each_glob_ref(add_oid, s, oids);
1164 if (old_nr == oids->nr)
1165 warning("Ignoring --negotiation-tip=%s because it does not match any refs",
1168 smart_options->negotiation_tips = oids;
1171 static struct transport *prepare_transport(struct remote *remote, int deepen)
1173 struct transport *transport;
1174 transport = transport_get(remote, NULL);
1175 transport_set_verbosity(transport, verbosity, progress);
1176 transport->family = family;
1178 set_option(transport, TRANS_OPT_UPLOADPACK, upload_pack);
1180 set_option(transport, TRANS_OPT_KEEP, "yes");
1182 set_option(transport, TRANS_OPT_DEPTH, depth);
1183 if (deepen && deepen_since)
1184 set_option(transport, TRANS_OPT_DEEPEN_SINCE, deepen_since);
1185 if (deepen && deepen_not.nr)
1186 set_option(transport, TRANS_OPT_DEEPEN_NOT,
1187 (const char *)&deepen_not);
1188 if (deepen_relative)
1189 set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, "yes");
1191 set_option(transport, TRANS_OPT_UPDATE_SHALLOW, "yes");
1192 if (filter_options.choice) {
1193 set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER,
1194 filter_options.filter_spec);
1195 set_option(transport, TRANS_OPT_FROM_PROMISOR, "1");
1197 if (negotiation_tip.nr) {
1198 if (transport->smart_options)
1199 add_negotiation_tips(transport->smart_options);
1201 warning("Ignoring --negotiation-tip because the protocol does not support it.");
1206 static void backfill_tags(struct transport *transport, struct ref *ref_map)
1211 * Once we have set TRANS_OPT_DEEPEN_SINCE, we can't unset it
1212 * when remote helper is used (setting it to an empty string
1213 * is not unsetting). We could extend the remote helper
1214 * protocol for that, but for now, just force a new connection
1215 * without deepen-since. Similar story for deepen-not.
1217 cannot_reuse = transport->cannot_reuse ||
1218 deepen_since || deepen_not.nr;
1220 gsecondary = prepare_transport(transport->remote, 0);
1221 transport = gsecondary;
1224 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
1225 transport_set_option(transport, TRANS_OPT_DEPTH, "0");
1226 transport_set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, NULL);
1227 if (!fetch_refs(transport, ref_map))
1228 consume_refs(transport, ref_map);
1231 transport_disconnect(gsecondary);
1236 static int do_fetch(struct transport *transport,
1239 struct ref *ref_map;
1240 int autotags = (transport->remote->fetch_tags == 1);
1242 const struct ref *remote_refs;
1243 struct argv_array ref_prefixes = ARGV_ARRAY_INIT;
1244 int must_list_refs = 1;
1246 if (tags == TAGS_DEFAULT) {
1247 if (transport->remote->fetch_tags == 2)
1249 if (transport->remote->fetch_tags == -1)
1253 /* if not appending, truncate FETCH_HEAD */
1254 if (!append && !dry_run) {
1255 retcode = truncate_fetch_head();
1263 refspec_ref_prefixes(rs, &ref_prefixes);
1266 * We can avoid listing refs if all of them are exact
1270 for (i = 0; i < rs->nr; i++) {
1271 if (!rs->items[i].exact_sha1) {
1276 } else if (transport->remote && transport->remote->fetch.nr)
1277 refspec_ref_prefixes(&transport->remote->fetch, &ref_prefixes);
1279 if (tags == TAGS_SET || tags == TAGS_DEFAULT) {
1281 if (ref_prefixes.argc)
1282 argv_array_push(&ref_prefixes, "refs/tags/");
1286 remote_refs = transport_get_remote_refs(transport, &ref_prefixes);
1290 argv_array_clear(&ref_prefixes);
1292 ref_map = get_ref_map(transport->remote, remote_refs, rs,
1294 if (!update_head_ok)
1295 check_not_current_branch(ref_map);
1297 if (tags == TAGS_DEFAULT && autotags)
1298 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
1301 * We only prune based on refspecs specified
1302 * explicitly (via command line or configuration); we
1303 * don't care whether --tags was specified.
1306 prune_refs(rs, ref_map, transport->url);
1308 prune_refs(&transport->remote->fetch,
1313 if (fetch_refs(transport, ref_map) || consume_refs(transport, ref_map)) {
1320 /* if neither --no-tags nor --tags was specified, do automated tag
1322 if (tags == TAGS_DEFAULT && autotags) {
1323 struct ref **tail = &ref_map;
1325 find_non_local_tags(remote_refs, &ref_map, &tail);
1327 backfill_tags(transport, ref_map);
1335 static int get_one_remote_for_fetch(struct remote *remote, void *priv)
1337 struct string_list *list = priv;
1338 if (!remote->skip_default_update)
1339 string_list_append(list, remote->name);
1343 struct remote_group_data {
1345 struct string_list *list;
1348 static int get_remote_group(const char *key, const char *value, void *priv)
1350 struct remote_group_data *g = priv;
1352 if (skip_prefix(key, "remotes.", &key) && !strcmp(key, g->name)) {
1353 /* split list by white space */
1355 size_t wordlen = strcspn(value, " \t\n");
1358 string_list_append_nodup(g->list,
1359 xstrndup(value, wordlen));
1360 value += wordlen + (value[wordlen] != '\0');
1367 static int add_remote_or_group(const char *name, struct string_list *list)
1369 int prev_nr = list->nr;
1370 struct remote_group_data g;
1371 g.name = name; g.list = list;
1373 git_config(get_remote_group, &g);
1374 if (list->nr == prev_nr) {
1375 struct remote *remote = remote_get(name);
1376 if (!remote_is_configured(remote, 0))
1378 string_list_append(list, remote->name);
1383 static void add_options_to_argv(struct argv_array *argv)
1386 argv_array_push(argv, "--dry-run");
1388 argv_array_push(argv, prune ? "--prune" : "--no-prune");
1389 if (prune_tags != -1)
1390 argv_array_push(argv, prune_tags ? "--prune-tags" : "--no-prune-tags");
1392 argv_array_push(argv, "--update-head-ok");
1394 argv_array_push(argv, "--force");
1396 argv_array_push(argv, "--keep");
1397 if (recurse_submodules == RECURSE_SUBMODULES_ON)
1398 argv_array_push(argv, "--recurse-submodules");
1399 else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND)
1400 argv_array_push(argv, "--recurse-submodules=on-demand");
1401 if (tags == TAGS_SET)
1402 argv_array_push(argv, "--tags");
1403 else if (tags == TAGS_UNSET)
1404 argv_array_push(argv, "--no-tags");
1406 argv_array_push(argv, "-v");
1408 argv_array_push(argv, "-v");
1409 else if (verbosity < 0)
1410 argv_array_push(argv, "-q");
1414 static int fetch_multiple(struct string_list *list)
1417 struct argv_array argv = ARGV_ARRAY_INIT;
1419 if (!append && !dry_run) {
1420 int errcode = truncate_fetch_head();
1425 argv_array_pushl(&argv, "fetch", "--append", NULL);
1426 add_options_to_argv(&argv);
1428 for (i = 0; i < list->nr; i++) {
1429 const char *name = list->items[i].string;
1430 argv_array_push(&argv, name);
1432 printf(_("Fetching %s\n"), name);
1433 if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
1434 error(_("Could not fetch %s"), name);
1437 argv_array_pop(&argv);
1440 argv_array_clear(&argv);
1445 * Fetching from the promisor remote should use the given filter-spec
1446 * or inherit the default filter-spec from the config.
1448 static inline void fetch_one_setup_partial(struct remote *remote)
1451 * Explicit --no-filter argument overrides everything, regardless
1452 * of any prior partial clones and fetches.
1454 if (filter_options.no_filter)
1458 * If no prior partial clone/fetch and the current fetch DID NOT
1459 * request a partial-fetch, do a normal fetch.
1461 if (!repository_format_partial_clone && !filter_options.choice)
1465 * If this is the FIRST partial-fetch request, we enable partial
1466 * on this repo and remember the given filter-spec as the default
1467 * for subsequent fetches to this remote.
1469 if (!repository_format_partial_clone && filter_options.choice) {
1470 partial_clone_register(remote->name, &filter_options);
1475 * We are currently limited to only ONE promisor remote and only
1476 * allow partial-fetches from the promisor remote.
1478 if (strcmp(remote->name, repository_format_partial_clone)) {
1479 if (filter_options.choice)
1480 die(_("--filter can only be used with the remote configured in core.partialClone"));
1485 * Do a partial-fetch from the promisor remote using either the
1486 * explicitly given filter-spec or inherit the filter-spec from
1489 if (!filter_options.choice)
1490 partial_clone_get_default_filter_spec(&filter_options);
1494 static int fetch_one(struct remote *remote, int argc, const char **argv, int prune_tags_ok)
1496 struct refspec rs = REFSPEC_INIT_FETCH;
1499 int maybe_prune_tags;
1500 int remote_via_config = remote_is_configured(remote, 0);
1503 die(_("No remote repository specified. Please, specify either a URL or a\n"
1504 "remote name from which new revisions should be fetched."));
1506 gtransport = prepare_transport(remote, 1);
1509 /* no command line request */
1510 if (0 <= remote->prune)
1511 prune = remote->prune;
1512 else if (0 <= fetch_prune_config)
1513 prune = fetch_prune_config;
1515 prune = PRUNE_BY_DEFAULT;
1518 if (prune_tags < 0) {
1519 /* no command line request */
1520 if (0 <= remote->prune_tags)
1521 prune_tags = remote->prune_tags;
1522 else if (0 <= fetch_prune_tags_config)
1523 prune_tags = fetch_prune_tags_config;
1525 prune_tags = PRUNE_TAGS_BY_DEFAULT;
1528 maybe_prune_tags = prune_tags_ok && prune_tags;
1529 if (maybe_prune_tags && remote_via_config)
1530 refspec_append(&remote->fetch, TAG_REFSPEC);
1532 if (maybe_prune_tags && (argc || !remote_via_config))
1533 refspec_append(&rs, TAG_REFSPEC);
1535 for (i = 0; i < argc; i++) {
1536 if (!strcmp(argv[i], "tag")) {
1540 die(_("You need to specify a tag name."));
1542 tag = xstrfmt("refs/tags/%s:refs/tags/%s",
1544 refspec_append(&rs, tag);
1547 refspec_append(&rs, argv[i]);
1551 if (server_options.nr)
1552 gtransport->server_options = &server_options;
1554 sigchain_push_common(unlock_pack_on_signal);
1555 atexit(unlock_pack);
1556 exit_code = do_fetch(gtransport, &rs);
1558 transport_disconnect(gtransport);
1563 int cmd_fetch(int argc, const char **argv, const char *prefix)
1566 struct string_list list = STRING_LIST_INIT_DUP;
1567 struct remote *remote = NULL;
1569 int prune_tags_ok = 1;
1570 struct argv_array argv_gc_auto = ARGV_ARRAY_INIT;
1572 packet_trace_identity("fetch");
1574 fetch_if_missing = 0;
1576 /* Record the command line for the reflog */
1577 strbuf_addstr(&default_rla, "fetch");
1578 for (i = 1; i < argc; i++)
1579 strbuf_addf(&default_rla, " %s", argv[i]);
1581 fetch_config_from_gitmodules(&max_children, &recurse_submodules);
1582 git_config(git_fetch_config, NULL);
1584 argc = parse_options(argc, argv, prefix,
1585 builtin_fetch_options, builtin_fetch_usage, 0);
1587 if (deepen_relative) {
1588 if (deepen_relative < 0)
1589 die(_("Negative depth in --deepen is not supported"));
1591 die(_("--deepen and --depth are mutually exclusive"));
1592 depth = xstrfmt("%d", deepen_relative);
1596 die(_("--depth and --unshallow cannot be used together"));
1597 else if (!is_repository_shallow(the_repository))
1598 die(_("--unshallow on a complete repository does not make sense"));
1600 depth = xstrfmt("%d", INFINITE_DEPTH);
1603 /* no need to be strict, transport_set_option() will validate it again */
1604 if (depth && atoi(depth) < 1)
1605 die(_("depth %s is not a positive number"), depth);
1606 if (depth || deepen_since || deepen_not.nr)
1609 if (filter_options.choice && !repository_format_partial_clone)
1610 die("--filter can only be used when extensions.partialClone is set");
1614 die(_("fetch --all does not take a repository argument"));
1616 die(_("fetch --all does not make sense with refspecs"));
1617 (void) for_each_remote(get_one_remote_for_fetch, &list);
1618 } else if (argc == 0) {
1619 /* No arguments -- use default remote */
1620 remote = remote_get(NULL);
1621 } else if (multiple) {
1622 /* All arguments are assumed to be remotes or groups */
1623 for (i = 0; i < argc; i++)
1624 if (!add_remote_or_group(argv[i], &list))
1625 die(_("No such remote or remote group: %s"), argv[i]);
1627 /* Single remote or group */
1628 (void) add_remote_or_group(argv[0], &list);
1630 /* More than one remote */
1632 die(_("Fetching a group and specifying refspecs does not make sense"));
1634 /* Zero or one remotes */
1635 remote = remote_get(argv[0]);
1636 prune_tags_ok = (argc == 1);
1643 if (filter_options.choice || repository_format_partial_clone)
1644 fetch_one_setup_partial(remote);
1645 result = fetch_one(remote, argc, argv, prune_tags_ok);
1647 if (filter_options.choice)
1648 die(_("--filter can only be used with the remote configured in core.partialClone"));
1649 /* TODO should this also die if we have a previous partial-clone? */
1650 result = fetch_multiple(&list);
1653 if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
1654 struct argv_array options = ARGV_ARRAY_INIT;
1656 add_options_to_argv(&options);
1657 result = fetch_populated_submodules(the_repository,
1661 recurse_submodules_default,
1664 argv_array_clear(&options);
1667 string_list_clear(&list, 0);
1669 close_all_packs(the_repository->objects);
1671 argv_array_pushl(&argv_gc_auto, "gc", "--auto", NULL);
1673 argv_array_push(&argv_gc_auto, "--quiet");
1674 run_command_v_opt(argv_gc_auto.argv, RUN_GIT_CMD);
1675 argv_array_clear(&argv_gc_auto);