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 add_existing(const char *refname, const struct object_id *oid,
227 int flag, void *cbdata)
229 struct string_list *list = (struct string_list *)cbdata;
230 struct string_list_item *item = string_list_insert(list, refname);
231 struct object_id *old_oid = xmalloc(sizeof(*old_oid));
233 oidcpy(old_oid, oid);
234 item->util = old_oid;
238 static int will_fetch(struct ref **head, const unsigned char *sha1)
240 struct ref *rm = *head;
242 if (hasheq(rm->old_oid.hash, sha1))
249 static void find_non_local_tags(const struct ref *refs,
253 struct string_list existing_refs = STRING_LIST_INIT_DUP;
254 struct string_list remote_refs = STRING_LIST_INIT_NODUP;
255 const struct ref *ref;
256 struct string_list_item *item = NULL;
258 for_each_ref(add_existing, &existing_refs);
259 for (ref = refs; ref; ref = ref->next) {
260 if (!starts_with(ref->name, "refs/tags/"))
264 * The peeled ref always follows the matching base
265 * ref, so if we see a peeled ref that we don't want
266 * to fetch then we can mark the ref entry in the list
267 * as one to ignore by setting util to NULL.
269 if (ends_with(ref->name, "^{}")) {
271 !has_object_file_with_flags(&ref->old_oid,
272 OBJECT_INFO_QUICK) &&
273 !will_fetch(head, ref->old_oid.hash) &&
274 !has_sha1_file_with_flags(item->util,
275 OBJECT_INFO_QUICK) &&
276 !will_fetch(head, item->util))
283 * If item is non-NULL here, then we previously saw a
284 * ref not followed by a peeled reference, so we need
285 * to check if it is a lightweight tag that we want to
289 !has_sha1_file_with_flags(item->util, OBJECT_INFO_QUICK) &&
290 !will_fetch(head, item->util))
295 /* skip duplicates and refs that we already have */
296 if (string_list_has_string(&remote_refs, ref->name) ||
297 string_list_has_string(&existing_refs, ref->name))
300 item = string_list_insert(&remote_refs, ref->name);
301 item->util = (void *)&ref->old_oid;
303 string_list_clear(&existing_refs, 1);
306 * We may have a final lightweight tag that needs to be
307 * checked to see if it needs fetching.
310 !has_sha1_file_with_flags(item->util, OBJECT_INFO_QUICK) &&
311 !will_fetch(head, item->util))
315 * For all the tags in the remote_refs string list,
316 * add them to the list of refs to be fetched
318 for_each_string_list_item(item, &remote_refs) {
319 /* Unless we have already decided to ignore this item... */
322 struct ref *rm = alloc_ref(item->string);
323 rm->peer_ref = alloc_ref(item->string);
324 oidcpy(&rm->old_oid, item->util);
330 string_list_clear(&remote_refs, 0);
333 static struct ref *get_ref_map(struct remote *remote,
334 const struct ref *remote_refs,
336 int tags, int *autotags)
340 struct ref *ref_map = NULL;
341 struct ref **tail = &ref_map;
343 /* opportunistically-updated references: */
344 struct ref *orefs = NULL, **oref_tail = &orefs;
346 struct string_list existing_refs = STRING_LIST_INIT_DUP;
349 struct refspec *fetch_refspec;
351 for (i = 0; i < rs->nr; i++) {
352 get_fetch_map(remote_refs, &rs->items[i], &tail, 0);
353 if (rs->items[i].dst && rs->items[i].dst[0])
356 /* Merge everything on the command line (but not --tags) */
357 for (rm = ref_map; rm; rm = rm->next)
358 rm->fetch_head_status = FETCH_HEAD_MERGE;
361 * For any refs that we happen to be fetching via
362 * command-line arguments, the destination ref might
363 * have been missing or have been different than the
364 * remote-tracking ref that would be derived from the
365 * configured refspec. In these cases, we want to
366 * take the opportunity to update their configured
367 * remote-tracking reference. However, we do not want
368 * to mention these entries in FETCH_HEAD at all, as
369 * they would simply be duplicates of existing
370 * entries, so we set them FETCH_HEAD_IGNORE below.
372 * We compute these entries now, based only on the
373 * refspecs specified on the command line. But we add
374 * them to the list following the refspecs resulting
375 * from the tags option so that one of the latter,
376 * which has FETCH_HEAD_NOT_FOR_MERGE, is not removed
377 * by ref_remove_duplicates() in favor of one of these
378 * opportunistic entries with FETCH_HEAD_IGNORE.
381 fetch_refspec = &refmap;
383 fetch_refspec = &remote->fetch;
385 for (i = 0; i < fetch_refspec->nr; i++)
386 get_fetch_map(ref_map, &fetch_refspec->items[i], &oref_tail, 1);
387 } else if (refmap.nr) {
388 die("--refmap option is only meaningful with command-line refspec(s).");
390 /* Use the defaults */
391 struct branch *branch = branch_get(NULL);
392 int has_merge = branch_has_merge_config(branch);
395 /* Note: has_merge implies non-NULL branch->remote_name */
396 (has_merge && !strcmp(branch->remote_name, remote->name)))) {
397 for (i = 0; i < remote->fetch.nr; i++) {
398 get_fetch_map(remote_refs, &remote->fetch.items[i], &tail, 0);
399 if (remote->fetch.items[i].dst &&
400 remote->fetch.items[i].dst[0])
402 if (!i && !has_merge && ref_map &&
403 !remote->fetch.items[0].pattern)
404 ref_map->fetch_head_status = FETCH_HEAD_MERGE;
407 * if the remote we're fetching from is the same
408 * as given in branch.<name>.remote, we add the
409 * ref given in branch.<name>.merge, too.
411 * Note: has_merge implies non-NULL branch->remote_name
414 !strcmp(branch->remote_name, remote->name))
415 add_merge_config(&ref_map, remote_refs, branch, &tail);
417 ref_map = get_remote_ref(remote_refs, "HEAD");
419 die(_("Couldn't find remote ref HEAD"));
420 ref_map->fetch_head_status = FETCH_HEAD_MERGE;
421 tail = &ref_map->next;
425 if (tags == TAGS_SET)
426 /* also fetch all tags */
427 get_fetch_map(remote_refs, tag_refspec, &tail, 0);
428 else if (tags == TAGS_DEFAULT && *autotags)
429 find_non_local_tags(remote_refs, &ref_map, &tail);
431 /* Now append any refs to be updated opportunistically: */
433 for (rm = orefs; rm; rm = rm->next) {
434 rm->fetch_head_status = FETCH_HEAD_IGNORE;
438 ref_map = ref_remove_duplicates(ref_map);
440 for_each_ref(add_existing, &existing_refs);
441 for (rm = ref_map; rm; rm = rm->next) {
443 struct string_list_item *peer_item =
444 string_list_lookup(&existing_refs,
447 struct object_id *old_oid = peer_item->util;
448 oidcpy(&rm->peer_ref->old_oid, old_oid);
452 string_list_clear(&existing_refs, 1);
457 #define STORE_REF_ERROR_OTHER 1
458 #define STORE_REF_ERROR_DF_CONFLICT 2
460 static int s_update_ref(const char *action,
465 char *rla = getenv("GIT_REFLOG_ACTION");
466 struct ref_transaction *transaction;
467 struct strbuf err = STRBUF_INIT;
468 int ret, df_conflict = 0;
473 rla = default_rla.buf;
474 msg = xstrfmt("%s: %s", rla, action);
476 transaction = ref_transaction_begin(&err);
478 ref_transaction_update(transaction, ref->name,
480 check_old ? &ref->old_oid : NULL,
484 ret = ref_transaction_commit(transaction, &err);
486 df_conflict = (ret == TRANSACTION_NAME_CONFLICT);
490 ref_transaction_free(transaction);
491 strbuf_release(&err);
495 ref_transaction_free(transaction);
496 error("%s", err.buf);
497 strbuf_release(&err);
499 return df_conflict ? STORE_REF_ERROR_DF_CONFLICT
500 : STORE_REF_ERROR_OTHER;
503 static int refcol_width = 10;
504 static int compact_format;
506 static void adjust_refcol_width(const struct ref *ref)
508 int max, rlen, llen, len;
510 /* uptodate lines are only shown on high verbosity level */
511 if (!verbosity && oideq(&ref->peer_ref->old_oid, &ref->old_oid))
514 max = term_columns();
515 rlen = utf8_strwidth(prettify_refname(ref->name));
517 llen = utf8_strwidth(prettify_refname(ref->peer_ref->name));
520 * rough estimation to see if the output line is too long and
521 * should not be counted (we can't do precise calculation
522 * anyway because we don't know if the error explanation part
523 * will be printed in update_local_ref)
525 if (compact_format) {
529 len = 21 /* flag and summary */ + rlen + 4 /* -> */ + llen;
534 * Not precise calculation for compact mode because '*' can
535 * appear on the left hand side of '->' and shrink the column
538 if (refcol_width < rlen)
542 static void prepare_format_display(struct ref *ref_map)
545 const char *format = "full";
547 git_config_get_string_const("fetch.output", &format);
548 if (!strcasecmp(format, "full"))
550 else if (!strcasecmp(format, "compact"))
553 die(_("configuration fetch.output contains invalid value %s"),
556 for (rm = ref_map; rm; rm = rm->next) {
557 if (rm->status == REF_STATUS_REJECT_SHALLOW ||
559 !strcmp(rm->name, "HEAD"))
562 adjust_refcol_width(rm);
566 static void print_remote_to_local(struct strbuf *display,
567 const char *remote, const char *local)
569 strbuf_addf(display, "%-*s -> %s", refcol_width, remote, local);
572 static int find_and_replace(struct strbuf *haystack,
574 const char *placeholder)
576 const char *p = strstr(haystack->buf, needle);
582 if (p > haystack->buf && p[-1] != '/')
586 nlen = strlen(needle);
587 if (plen > nlen && p[nlen] != '/')
590 strbuf_splice(haystack, p - haystack->buf, nlen,
591 placeholder, strlen(placeholder));
595 static void print_compact(struct strbuf *display,
596 const char *remote, const char *local)
598 struct strbuf r = STRBUF_INIT;
599 struct strbuf l = STRBUF_INIT;
601 if (!strcmp(remote, local)) {
602 strbuf_addf(display, "%-*s -> *", refcol_width, remote);
606 strbuf_addstr(&r, remote);
607 strbuf_addstr(&l, local);
609 if (!find_and_replace(&r, local, "*"))
610 find_and_replace(&l, remote, "*");
611 print_remote_to_local(display, r.buf, l.buf);
617 static void format_display(struct strbuf *display, char code,
618 const char *summary, const char *error,
619 const char *remote, const char *local,
622 int width = (summary_width + strlen(summary) - gettext_width(summary));
624 strbuf_addf(display, "%c %-*s ", code, width, summary);
626 print_remote_to_local(display, remote, local);
628 print_compact(display, remote, local);
630 strbuf_addf(display, " (%s)", error);
633 static int update_local_ref(struct ref *ref,
635 const struct ref *remote_ref,
636 struct strbuf *display,
639 struct commit *current = NULL, *updated;
640 enum object_type type;
641 struct branch *current_branch = branch_get(NULL);
642 const char *pretty_ref = prettify_refname(ref->name);
644 type = oid_object_info(the_repository, &ref->new_oid, NULL);
646 die(_("object %s not found"), oid_to_hex(&ref->new_oid));
648 if (oideq(&ref->old_oid, &ref->new_oid)) {
650 format_display(display, '=', _("[up to date]"), NULL,
651 remote, pretty_ref, summary_width);
655 if (current_branch &&
656 !strcmp(ref->name, current_branch->name) &&
657 !(update_head_ok || is_bare_repository()) &&
658 !is_null_oid(&ref->old_oid)) {
660 * If this is the head, and it's not okay to update
661 * the head, and the old value of the head isn't empty...
663 format_display(display, '!', _("[rejected]"),
664 _("can't fetch in current branch"),
665 remote, pretty_ref, summary_width);
669 if (!is_null_oid(&ref->old_oid) &&
670 starts_with(ref->name, "refs/tags/")) {
671 if (force || ref->force) {
673 r = s_update_ref("updating tag", ref, 0);
674 format_display(display, r ? '!' : 't', _("[tag update]"),
675 r ? _("unable to update local ref") : NULL,
676 remote, pretty_ref, summary_width);
679 format_display(display, '!', _("[rejected]"), _("would clobber existing tag"),
680 remote, pretty_ref, summary_width);
685 current = lookup_commit_reference_gently(the_repository,
687 updated = lookup_commit_reference_gently(the_repository,
689 if (!current || !updated) {
694 * Nicely describe the new ref we're fetching.
695 * Base this on the remote's ref name, as it's
696 * more likely to follow a standard layout.
698 const char *name = remote_ref ? remote_ref->name : "";
699 if (starts_with(name, "refs/tags/")) {
701 what = _("[new tag]");
702 } else if (starts_with(name, "refs/heads/")) {
703 msg = "storing head";
704 what = _("[new branch]");
707 what = _("[new ref]");
710 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
711 (recurse_submodules != RECURSE_SUBMODULES_ON))
712 check_for_new_submodule_commits(&ref->new_oid);
713 r = s_update_ref(msg, ref, 0);
714 format_display(display, r ? '!' : '*', what,
715 r ? _("unable to update local ref") : NULL,
716 remote, pretty_ref, summary_width);
720 if (in_merge_bases(current, updated)) {
721 struct strbuf quickref = STRBUF_INIT;
723 strbuf_add_unique_abbrev(&quickref, ¤t->object.oid, DEFAULT_ABBREV);
724 strbuf_addstr(&quickref, "..");
725 strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
726 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
727 (recurse_submodules != RECURSE_SUBMODULES_ON))
728 check_for_new_submodule_commits(&ref->new_oid);
729 r = s_update_ref("fast-forward", ref, 1);
730 format_display(display, r ? '!' : ' ', quickref.buf,
731 r ? _("unable to update local ref") : NULL,
732 remote, pretty_ref, summary_width);
733 strbuf_release(&quickref);
735 } else if (force || ref->force) {
736 struct strbuf quickref = STRBUF_INIT;
738 strbuf_add_unique_abbrev(&quickref, ¤t->object.oid, DEFAULT_ABBREV);
739 strbuf_addstr(&quickref, "...");
740 strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
741 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
742 (recurse_submodules != RECURSE_SUBMODULES_ON))
743 check_for_new_submodule_commits(&ref->new_oid);
744 r = s_update_ref("forced-update", ref, 1);
745 format_display(display, r ? '!' : '+', quickref.buf,
746 r ? _("unable to update local ref") : _("forced update"),
747 remote, pretty_ref, summary_width);
748 strbuf_release(&quickref);
751 format_display(display, '!', _("[rejected]"), _("non-fast-forward"),
752 remote, pretty_ref, summary_width);
757 static int iterate_ref_map(void *cb_data, struct object_id *oid)
759 struct ref **rm = cb_data;
760 struct ref *ref = *rm;
762 while (ref && ref->status == REF_STATUS_REJECT_SHALLOW)
765 return -1; /* end of the list */
767 oidcpy(oid, &ref->old_oid);
771 static int store_updated_refs(const char *raw_url, const char *remote_name,
772 int connectivity_checked, struct ref *ref_map)
775 struct commit *commit;
776 int url_len, i, rc = 0;
777 struct strbuf note = STRBUF_INIT;
778 const char *what, *kind;
781 const char *filename = dry_run ? "/dev/null" : git_path_fetch_head(the_repository);
783 int summary_width = transport_summary_width(ref_map);
785 fp = fopen(filename, "a");
787 return error_errno(_("cannot open %s"), filename);
790 url = transport_anonymize_url(raw_url);
792 url = xstrdup("foreign");
794 if (!connectivity_checked) {
796 if (check_connected(iterate_ref_map, &rm, NULL)) {
797 rc = error(_("%s did not send all necessary objects\n"), url);
802 prepare_format_display(ref_map);
805 * We do a pass for each fetch_head_status type in their enum order, so
806 * merged entries are written before not-for-merge. That lets readers
807 * use FETCH_HEAD as a refname to refer to the ref to be merged.
809 for (want_status = FETCH_HEAD_MERGE;
810 want_status <= FETCH_HEAD_IGNORE;
812 for (rm = ref_map; rm; rm = rm->next) {
813 struct ref *ref = NULL;
814 const char *merge_status_marker = "";
816 if (rm->status == REF_STATUS_REJECT_SHALLOW) {
817 if (want_status == FETCH_HEAD_MERGE)
818 warning(_("reject %s because shallow roots are not allowed to be updated"),
819 rm->peer_ref ? rm->peer_ref->name : rm->name);
823 commit = lookup_commit_reference_gently(the_repository,
827 rm->fetch_head_status = FETCH_HEAD_NOT_FOR_MERGE;
829 if (rm->fetch_head_status != want_status)
833 ref = alloc_ref(rm->peer_ref->name);
834 oidcpy(&ref->old_oid, &rm->peer_ref->old_oid);
835 oidcpy(&ref->new_oid, &rm->old_oid);
836 ref->force = rm->peer_ref->force;
840 if (!strcmp(rm->name, "HEAD")) {
844 else if (starts_with(rm->name, "refs/heads/")) {
846 what = rm->name + 11;
848 else if (starts_with(rm->name, "refs/tags/")) {
850 what = rm->name + 10;
852 else if (starts_with(rm->name, "refs/remotes/")) {
853 kind = "remote-tracking branch";
854 what = rm->name + 13;
861 url_len = strlen(url);
862 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
865 if (4 < i && !strncmp(".git", url + i - 3, 4))
871 strbuf_addf(¬e, "%s ", kind);
872 strbuf_addf(¬e, "'%s' of ", what);
874 switch (rm->fetch_head_status) {
875 case FETCH_HEAD_NOT_FOR_MERGE:
876 merge_status_marker = "not-for-merge";
878 case FETCH_HEAD_MERGE:
879 fprintf(fp, "%s\t%s\t%s",
880 oid_to_hex(&rm->old_oid),
883 for (i = 0; i < url_len; ++i)
891 /* do not write anything to FETCH_HEAD */
897 rc |= update_local_ref(ref, what, rm, ¬e,
901 format_display(¬e, '*',
902 *kind ? kind : "branch", NULL,
903 *what ? what : "HEAD",
904 "FETCH_HEAD", summary_width);
906 if (verbosity >= 0 && !shown_url) {
907 fprintf(stderr, _("From %.*s\n"),
912 fprintf(stderr, " %s\n", note.buf);
917 if (rc & STORE_REF_ERROR_DF_CONFLICT)
918 error(_("some local refs could not be updated; try running\n"
919 " 'git remote prune %s' to remove any old, conflicting "
920 "branches"), remote_name);
923 strbuf_release(¬e);
930 * We would want to bypass the object transfer altogether if
931 * everything we are going to fetch already exists and is connected
934 static int quickfetch(struct ref *ref_map)
936 struct ref *rm = ref_map;
937 struct check_connected_options opt = CHECK_CONNECTED_INIT;
940 * If we are deepening a shallow clone we already have these
941 * objects reachable. Running rev-list here will return with
942 * a good (0) exit status and we'll bypass the fetch that we
943 * really need to perform. Claiming failure now will ensure
944 * we perform the network exchange to deepen our history.
949 return check_connected(iterate_ref_map, &rm, &opt);
952 static int fetch_refs(struct transport *transport, struct ref *ref_map)
954 int ret = quickfetch(ref_map);
956 ret = transport_fetch_refs(transport, ref_map);
959 * Keep the new pack's ".keep" file around to allow the caller
960 * time to update refs to reference the new objects.
963 transport_unlock_pack(transport);
967 /* Update local refs based on the ref values fetched from a remote */
968 static int consume_refs(struct transport *transport, struct ref *ref_map)
970 int connectivity_checked = transport->smart_options
971 ? transport->smart_options->connectivity_checked : 0;
972 int ret = store_updated_refs(transport->url,
973 transport->remote->name,
974 connectivity_checked,
976 transport_unlock_pack(transport);
980 static int prune_refs(struct refspec *rs, struct ref *ref_map,
983 int url_len, i, result = 0;
984 struct ref *ref, *stale_refs = get_stale_heads(rs, ref_map);
986 int summary_width = transport_summary_width(stale_refs);
987 const char *dangling_msg = dry_run
988 ? _(" (%s will become dangling)")
989 : _(" (%s has become dangling)");
992 url = transport_anonymize_url(raw_url);
994 url = xstrdup("foreign");
996 url_len = strlen(url);
997 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
1001 if (4 < i && !strncmp(".git", url + i - 3, 4))
1005 struct string_list refnames = STRING_LIST_INIT_NODUP;
1007 for (ref = stale_refs; ref; ref = ref->next)
1008 string_list_append(&refnames, ref->name);
1010 result = delete_refs("fetch: prune", &refnames, 0);
1011 string_list_clear(&refnames, 0);
1014 if (verbosity >= 0) {
1015 for (ref = stale_refs; ref; ref = ref->next) {
1016 struct strbuf sb = STRBUF_INIT;
1018 fprintf(stderr, _("From %.*s\n"), url_len, url);
1021 format_display(&sb, '-', _("[deleted]"), NULL,
1022 _("(none)"), prettify_refname(ref->name),
1024 fprintf(stderr, " %s\n",sb.buf);
1025 strbuf_release(&sb);
1026 warn_dangling_symref(stderr, dangling_msg, ref->name);
1031 free_refs(stale_refs);
1035 static void check_not_current_branch(struct ref *ref_map)
1037 struct branch *current_branch = branch_get(NULL);
1039 if (is_bare_repository() || !current_branch)
1042 for (; ref_map; ref_map = ref_map->next)
1043 if (ref_map->peer_ref && !strcmp(current_branch->refname,
1044 ref_map->peer_ref->name))
1045 die(_("Refusing to fetch into current branch %s "
1046 "of non-bare repository"), current_branch->refname);
1049 static int truncate_fetch_head(void)
1051 const char *filename = git_path_fetch_head(the_repository);
1052 FILE *fp = fopen_for_writing(filename);
1055 return error_errno(_("cannot open %s"), filename);
1060 static void set_option(struct transport *transport, const char *name, const char *value)
1062 int r = transport_set_option(transport, name, value);
1064 die(_("Option \"%s\" value \"%s\" is not valid for %s"),
1065 name, value, transport->url);
1067 warning(_("Option \"%s\" is ignored for %s\n"),
1068 name, transport->url);
1072 static int add_oid(const char *refname, const struct object_id *oid, int flags,
1075 struct oid_array *oids = cb_data;
1077 oid_array_append(oids, oid);
1081 static void add_negotiation_tips(struct git_transport_options *smart_options)
1083 struct oid_array *oids = xcalloc(1, sizeof(*oids));
1086 for (i = 0; i < negotiation_tip.nr; i++) {
1087 const char *s = negotiation_tip.items[i].string;
1089 if (!has_glob_specials(s)) {
1090 struct object_id oid;
1091 if (get_oid(s, &oid))
1092 die("%s is not a valid object", s);
1093 oid_array_append(oids, &oid);
1097 for_each_glob_ref(add_oid, s, oids);
1098 if (old_nr == oids->nr)
1099 warning("Ignoring --negotiation-tip=%s because it does not match any refs",
1102 smart_options->negotiation_tips = oids;
1105 static struct transport *prepare_transport(struct remote *remote, int deepen)
1107 struct transport *transport;
1108 transport = transport_get(remote, NULL);
1109 transport_set_verbosity(transport, verbosity, progress);
1110 transport->family = family;
1112 set_option(transport, TRANS_OPT_UPLOADPACK, upload_pack);
1114 set_option(transport, TRANS_OPT_KEEP, "yes");
1116 set_option(transport, TRANS_OPT_DEPTH, depth);
1117 if (deepen && deepen_since)
1118 set_option(transport, TRANS_OPT_DEEPEN_SINCE, deepen_since);
1119 if (deepen && deepen_not.nr)
1120 set_option(transport, TRANS_OPT_DEEPEN_NOT,
1121 (const char *)&deepen_not);
1122 if (deepen_relative)
1123 set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, "yes");
1125 set_option(transport, TRANS_OPT_UPDATE_SHALLOW, "yes");
1126 if (filter_options.choice) {
1127 set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER,
1128 filter_options.filter_spec);
1129 set_option(transport, TRANS_OPT_FROM_PROMISOR, "1");
1131 if (negotiation_tip.nr) {
1132 if (transport->smart_options)
1133 add_negotiation_tips(transport->smart_options);
1135 warning("Ignoring --negotiation-tip because the protocol does not support it.");
1140 static void backfill_tags(struct transport *transport, struct ref *ref_map)
1145 * Once we have set TRANS_OPT_DEEPEN_SINCE, we can't unset it
1146 * when remote helper is used (setting it to an empty string
1147 * is not unsetting). We could extend the remote helper
1148 * protocol for that, but for now, just force a new connection
1149 * without deepen-since. Similar story for deepen-not.
1151 cannot_reuse = transport->cannot_reuse ||
1152 deepen_since || deepen_not.nr;
1154 gsecondary = prepare_transport(transport->remote, 0);
1155 transport = gsecondary;
1158 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
1159 transport_set_option(transport, TRANS_OPT_DEPTH, "0");
1160 transport_set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, NULL);
1161 if (!fetch_refs(transport, ref_map))
1162 consume_refs(transport, ref_map);
1165 transport_disconnect(gsecondary);
1170 static int do_fetch(struct transport *transport,
1173 struct ref *ref_map;
1174 int autotags = (transport->remote->fetch_tags == 1);
1176 const struct ref *remote_refs;
1177 struct argv_array ref_prefixes = ARGV_ARRAY_INIT;
1179 if (tags == TAGS_DEFAULT) {
1180 if (transport->remote->fetch_tags == 2)
1182 if (transport->remote->fetch_tags == -1)
1186 /* if not appending, truncate FETCH_HEAD */
1187 if (!append && !dry_run) {
1188 retcode = truncate_fetch_head();
1194 refspec_ref_prefixes(rs, &ref_prefixes);
1195 else if (transport->remote && transport->remote->fetch.nr)
1196 refspec_ref_prefixes(&transport->remote->fetch, &ref_prefixes);
1198 if (ref_prefixes.argc &&
1199 (tags == TAGS_SET || (tags == TAGS_DEFAULT))) {
1200 argv_array_push(&ref_prefixes, "refs/tags/");
1203 remote_refs = transport_get_remote_refs(transport, &ref_prefixes);
1204 argv_array_clear(&ref_prefixes);
1206 ref_map = get_ref_map(transport->remote, remote_refs, rs,
1208 if (!update_head_ok)
1209 check_not_current_branch(ref_map);
1211 if (tags == TAGS_DEFAULT && autotags)
1212 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
1215 * We only prune based on refspecs specified
1216 * explicitly (via command line or configuration); we
1217 * don't care whether --tags was specified.
1220 prune_refs(rs, ref_map, transport->url);
1222 prune_refs(&transport->remote->fetch,
1227 if (fetch_refs(transport, ref_map) || consume_refs(transport, ref_map)) {
1234 /* if neither --no-tags nor --tags was specified, do automated tag
1236 if (tags == TAGS_DEFAULT && autotags) {
1237 struct ref **tail = &ref_map;
1239 find_non_local_tags(remote_refs, &ref_map, &tail);
1241 backfill_tags(transport, ref_map);
1249 static int get_one_remote_for_fetch(struct remote *remote, void *priv)
1251 struct string_list *list = priv;
1252 if (!remote->skip_default_update)
1253 string_list_append(list, remote->name);
1257 struct remote_group_data {
1259 struct string_list *list;
1262 static int get_remote_group(const char *key, const char *value, void *priv)
1264 struct remote_group_data *g = priv;
1266 if (skip_prefix(key, "remotes.", &key) && !strcmp(key, g->name)) {
1267 /* split list by white space */
1269 size_t wordlen = strcspn(value, " \t\n");
1272 string_list_append_nodup(g->list,
1273 xstrndup(value, wordlen));
1274 value += wordlen + (value[wordlen] != '\0');
1281 static int add_remote_or_group(const char *name, struct string_list *list)
1283 int prev_nr = list->nr;
1284 struct remote_group_data g;
1285 g.name = name; g.list = list;
1287 git_config(get_remote_group, &g);
1288 if (list->nr == prev_nr) {
1289 struct remote *remote = remote_get(name);
1290 if (!remote_is_configured(remote, 0))
1292 string_list_append(list, remote->name);
1297 static void add_options_to_argv(struct argv_array *argv)
1300 argv_array_push(argv, "--dry-run");
1302 argv_array_push(argv, prune ? "--prune" : "--no-prune");
1303 if (prune_tags != -1)
1304 argv_array_push(argv, prune_tags ? "--prune-tags" : "--no-prune-tags");
1306 argv_array_push(argv, "--update-head-ok");
1308 argv_array_push(argv, "--force");
1310 argv_array_push(argv, "--keep");
1311 if (recurse_submodules == RECURSE_SUBMODULES_ON)
1312 argv_array_push(argv, "--recurse-submodules");
1313 else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND)
1314 argv_array_push(argv, "--recurse-submodules=on-demand");
1315 if (tags == TAGS_SET)
1316 argv_array_push(argv, "--tags");
1317 else if (tags == TAGS_UNSET)
1318 argv_array_push(argv, "--no-tags");
1320 argv_array_push(argv, "-v");
1322 argv_array_push(argv, "-v");
1323 else if (verbosity < 0)
1324 argv_array_push(argv, "-q");
1328 static int fetch_multiple(struct string_list *list)
1331 struct argv_array argv = ARGV_ARRAY_INIT;
1333 if (!append && !dry_run) {
1334 int errcode = truncate_fetch_head();
1339 argv_array_pushl(&argv, "fetch", "--append", NULL);
1340 add_options_to_argv(&argv);
1342 for (i = 0; i < list->nr; i++) {
1343 const char *name = list->items[i].string;
1344 argv_array_push(&argv, name);
1346 printf(_("Fetching %s\n"), name);
1347 if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
1348 error(_("Could not fetch %s"), name);
1351 argv_array_pop(&argv);
1354 argv_array_clear(&argv);
1359 * Fetching from the promisor remote should use the given filter-spec
1360 * or inherit the default filter-spec from the config.
1362 static inline void fetch_one_setup_partial(struct remote *remote)
1365 * Explicit --no-filter argument overrides everything, regardless
1366 * of any prior partial clones and fetches.
1368 if (filter_options.no_filter)
1372 * If no prior partial clone/fetch and the current fetch DID NOT
1373 * request a partial-fetch, do a normal fetch.
1375 if (!repository_format_partial_clone && !filter_options.choice)
1379 * If this is the FIRST partial-fetch request, we enable partial
1380 * on this repo and remember the given filter-spec as the default
1381 * for subsequent fetches to this remote.
1383 if (!repository_format_partial_clone && filter_options.choice) {
1384 partial_clone_register(remote->name, &filter_options);
1389 * We are currently limited to only ONE promisor remote and only
1390 * allow partial-fetches from the promisor remote.
1392 if (strcmp(remote->name, repository_format_partial_clone)) {
1393 if (filter_options.choice)
1394 die(_("--filter can only be used with the remote configured in core.partialClone"));
1399 * Do a partial-fetch from the promisor remote using either the
1400 * explicitly given filter-spec or inherit the filter-spec from
1403 if (!filter_options.choice)
1404 partial_clone_get_default_filter_spec(&filter_options);
1408 static int fetch_one(struct remote *remote, int argc, const char **argv, int prune_tags_ok)
1410 struct refspec rs = REFSPEC_INIT_FETCH;
1413 int maybe_prune_tags;
1414 int remote_via_config = remote_is_configured(remote, 0);
1417 die(_("No remote repository specified. Please, specify either a URL or a\n"
1418 "remote name from which new revisions should be fetched."));
1420 gtransport = prepare_transport(remote, 1);
1423 /* no command line request */
1424 if (0 <= remote->prune)
1425 prune = remote->prune;
1426 else if (0 <= fetch_prune_config)
1427 prune = fetch_prune_config;
1429 prune = PRUNE_BY_DEFAULT;
1432 if (prune_tags < 0) {
1433 /* no command line request */
1434 if (0 <= remote->prune_tags)
1435 prune_tags = remote->prune_tags;
1436 else if (0 <= fetch_prune_tags_config)
1437 prune_tags = fetch_prune_tags_config;
1439 prune_tags = PRUNE_TAGS_BY_DEFAULT;
1442 maybe_prune_tags = prune_tags_ok && prune_tags;
1443 if (maybe_prune_tags && remote_via_config)
1444 refspec_append(&remote->fetch, TAG_REFSPEC);
1446 if (maybe_prune_tags && (argc || !remote_via_config))
1447 refspec_append(&rs, TAG_REFSPEC);
1449 for (i = 0; i < argc; i++) {
1450 if (!strcmp(argv[i], "tag")) {
1454 die(_("You need to specify a tag name."));
1456 tag = xstrfmt("refs/tags/%s:refs/tags/%s",
1458 refspec_append(&rs, tag);
1461 refspec_append(&rs, argv[i]);
1465 if (server_options.nr)
1466 gtransport->server_options = &server_options;
1468 sigchain_push_common(unlock_pack_on_signal);
1469 atexit(unlock_pack);
1470 exit_code = do_fetch(gtransport, &rs);
1472 transport_disconnect(gtransport);
1477 int cmd_fetch(int argc, const char **argv, const char *prefix)
1480 struct string_list list = STRING_LIST_INIT_DUP;
1481 struct remote *remote = NULL;
1483 int prune_tags_ok = 1;
1484 struct argv_array argv_gc_auto = ARGV_ARRAY_INIT;
1486 packet_trace_identity("fetch");
1488 fetch_if_missing = 0;
1490 /* Record the command line for the reflog */
1491 strbuf_addstr(&default_rla, "fetch");
1492 for (i = 1; i < argc; i++)
1493 strbuf_addf(&default_rla, " %s", argv[i]);
1495 fetch_config_from_gitmodules(&max_children, &recurse_submodules);
1496 git_config(git_fetch_config, NULL);
1498 argc = parse_options(argc, argv, prefix,
1499 builtin_fetch_options, builtin_fetch_usage, 0);
1501 if (deepen_relative) {
1502 if (deepen_relative < 0)
1503 die(_("Negative depth in --deepen is not supported"));
1505 die(_("--deepen and --depth are mutually exclusive"));
1506 depth = xstrfmt("%d", deepen_relative);
1510 die(_("--depth and --unshallow cannot be used together"));
1511 else if (!is_repository_shallow(the_repository))
1512 die(_("--unshallow on a complete repository does not make sense"));
1514 depth = xstrfmt("%d", INFINITE_DEPTH);
1517 /* no need to be strict, transport_set_option() will validate it again */
1518 if (depth && atoi(depth) < 1)
1519 die(_("depth %s is not a positive number"), depth);
1520 if (depth || deepen_since || deepen_not.nr)
1523 if (filter_options.choice && !repository_format_partial_clone)
1524 die("--filter can only be used when extensions.partialClone is set");
1528 die(_("fetch --all does not take a repository argument"));
1530 die(_("fetch --all does not make sense with refspecs"));
1531 (void) for_each_remote(get_one_remote_for_fetch, &list);
1532 } else if (argc == 0) {
1533 /* No arguments -- use default remote */
1534 remote = remote_get(NULL);
1535 } else if (multiple) {
1536 /* All arguments are assumed to be remotes or groups */
1537 for (i = 0; i < argc; i++)
1538 if (!add_remote_or_group(argv[i], &list))
1539 die(_("No such remote or remote group: %s"), argv[i]);
1541 /* Single remote or group */
1542 (void) add_remote_or_group(argv[0], &list);
1544 /* More than one remote */
1546 die(_("Fetching a group and specifying refspecs does not make sense"));
1548 /* Zero or one remotes */
1549 remote = remote_get(argv[0]);
1550 prune_tags_ok = (argc == 1);
1557 if (filter_options.choice || repository_format_partial_clone)
1558 fetch_one_setup_partial(remote);
1559 result = fetch_one(remote, argc, argv, prune_tags_ok);
1561 if (filter_options.choice)
1562 die(_("--filter can only be used with the remote configured in core.partialClone"));
1563 /* TODO should this also die if we have a previous partial-clone? */
1564 result = fetch_multiple(&list);
1567 if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
1568 struct argv_array options = ARGV_ARRAY_INIT;
1570 add_options_to_argv(&options);
1571 result = fetch_populated_submodules(the_repository,
1575 recurse_submodules_default,
1578 argv_array_clear(&options);
1581 string_list_clear(&list, 0);
1583 close_all_packs(the_repository->objects);
1585 argv_array_pushl(&argv_gc_auto, "gc", "--auto", NULL);
1587 argv_array_push(&argv_gc_auto, "--quiet");
1588 run_command_v_opt(argv_gc_auto.argv, RUN_GIT_CMD);
1589 argv_array_clear(&argv_gc_auto);