6 #include "repository.h"
10 #include "string-list.h"
12 #include "transport.h"
13 #include "run-command.h"
14 #include "parse-options.h"
16 #include "submodule-config.h"
17 #include "submodule.h"
18 #include "connected.h"
19 #include "argv-array.h"
22 #include "list-objects-filter-options.h"
24 static const char * const builtin_fetch_usage[] = {
25 N_("git fetch [<options>] [<repository> [<refspec>...]]"),
26 N_("git fetch [<options>] <group>"),
27 N_("git fetch --multiple [<options>] [(<repository> | <group>)...]"),
28 N_("git fetch --all [<options>]"),
38 static int fetch_prune_config = -1; /* unspecified */
39 static int prune = -1; /* unspecified */
40 #define PRUNE_BY_DEFAULT 0 /* do we prune by default? */
42 static int fetch_prune_tags_config = -1; /* unspecified */
43 static int prune_tags = -1; /* unspecified */
44 #define PRUNE_TAGS_BY_DEFAULT 0 /* do we prune tags by default? */
46 static int all, append, dry_run, force, keep, multiple, update_head_ok, verbosity, deepen_relative;
47 static int progress = -1;
48 static int tags = TAGS_DEFAULT, unshallow, update_shallow, deepen;
49 static int max_children = 1;
50 static enum transport_family family;
51 static const char *depth;
52 static const char *deepen_since;
53 static const char *upload_pack;
54 static struct string_list deepen_not = STRING_LIST_INIT_NODUP;
55 static struct strbuf default_rla = STRBUF_INIT;
56 static struct transport *gtransport;
57 static struct transport *gsecondary;
58 static const char *submodule_prefix = "";
59 static int recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
60 static int recurse_submodules_default = RECURSE_SUBMODULES_ON_DEMAND;
61 static int shown_url = 0;
62 static int refmap_alloc, refmap_nr;
63 static const char **refmap_array;
64 static struct list_objects_filter_options filter_options;
66 static int git_fetch_config(const char *k, const char *v, void *cb)
68 if (!strcmp(k, "fetch.prune")) {
69 fetch_prune_config = git_config_bool(k, v);
73 if (!strcmp(k, "fetch.prunetags")) {
74 fetch_prune_tags_config = git_config_bool(k, v);
78 if (!strcmp(k, "submodule.recurse")) {
79 int r = git_config_bool(k, v) ?
80 RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;
81 recurse_submodules = r;
84 if (!strcmp(k, "submodule.fetchjobs")) {
85 max_children = parse_submodule_fetchjobs(k, v);
87 } else if (!strcmp(k, "fetch.recursesubmodules")) {
88 recurse_submodules = parse_fetch_recurse_submodules_arg(k, v);
92 return git_default_config(k, v, cb);
95 static int gitmodules_fetch_config(const char *var, const char *value, void *cb)
97 if (!strcmp(var, "submodule.fetchjobs")) {
98 max_children = parse_submodule_fetchjobs(var, value);
100 } else if (!strcmp(var, "fetch.recursesubmodules")) {
101 recurse_submodules = parse_fetch_recurse_submodules_arg(var, value);
108 static int parse_refmap_arg(const struct option *opt, const char *arg, int unset)
110 ALLOC_GROW(refmap_array, refmap_nr + 1, refmap_alloc);
113 * "git fetch --refmap='' origin foo"
114 * can be used to tell the command not to store anywhere
117 refmap_array[refmap_nr++] = arg;
121 static struct option builtin_fetch_options[] = {
122 OPT__VERBOSITY(&verbosity),
123 OPT_BOOL(0, "all", &all,
124 N_("fetch from all remotes")),
125 OPT_BOOL('a', "append", &append,
126 N_("append to .git/FETCH_HEAD instead of overwriting")),
127 OPT_STRING(0, "upload-pack", &upload_pack, N_("path"),
128 N_("path to upload pack on remote end")),
129 OPT__FORCE(&force, N_("force overwrite of local branch"), 0),
130 OPT_BOOL('m', "multiple", &multiple,
131 N_("fetch from multiple remotes")),
132 OPT_SET_INT('t', "tags", &tags,
133 N_("fetch all tags and associated objects"), TAGS_SET),
134 OPT_SET_INT('n', NULL, &tags,
135 N_("do not fetch all tags (--no-tags)"), TAGS_UNSET),
136 OPT_INTEGER('j', "jobs", &max_children,
137 N_("number of submodules fetched in parallel")),
138 OPT_BOOL('p', "prune", &prune,
139 N_("prune remote-tracking branches no longer on remote")),
140 OPT_BOOL('P', "prune-tags", &prune_tags,
141 N_("prune local tags no longer on remote and clobber changed tags")),
142 { OPTION_CALLBACK, 0, "recurse-submodules", &recurse_submodules, N_("on-demand"),
143 N_("control recursive fetching of submodules"),
144 PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules },
145 OPT_BOOL(0, "dry-run", &dry_run,
147 OPT_BOOL('k', "keep", &keep, N_("keep downloaded pack")),
148 OPT_BOOL('u', "update-head-ok", &update_head_ok,
149 N_("allow updating of HEAD ref")),
150 OPT_BOOL(0, "progress", &progress, N_("force progress reporting")),
151 OPT_STRING(0, "depth", &depth, N_("depth"),
152 N_("deepen history of shallow clone")),
153 OPT_STRING(0, "shallow-since", &deepen_since, N_("time"),
154 N_("deepen history of shallow repository based on time")),
155 OPT_STRING_LIST(0, "shallow-exclude", &deepen_not, N_("revision"),
156 N_("deepen history of shallow clone, excluding rev")),
157 OPT_INTEGER(0, "deepen", &deepen_relative,
158 N_("deepen history of shallow clone")),
159 { OPTION_SET_INT, 0, "unshallow", &unshallow, NULL,
160 N_("convert to a complete repository"),
161 PARSE_OPT_NONEG | PARSE_OPT_NOARG, NULL, 1 },
162 { OPTION_STRING, 0, "submodule-prefix", &submodule_prefix, N_("dir"),
163 N_("prepend this to submodule path output"), PARSE_OPT_HIDDEN },
164 { OPTION_CALLBACK, 0, "recurse-submodules-default",
165 &recurse_submodules_default, N_("on-demand"),
166 N_("default for recursive fetching of submodules "
167 "(lower priority than config files)"),
168 PARSE_OPT_HIDDEN, option_fetch_parse_recurse_submodules },
169 OPT_BOOL(0, "update-shallow", &update_shallow,
170 N_("accept refs that update .git/shallow")),
171 { OPTION_CALLBACK, 0, "refmap", NULL, N_("refmap"),
172 N_("specify fetch refmap"), PARSE_OPT_NONEG, parse_refmap_arg },
173 OPT_SET_INT('4', "ipv4", &family, N_("use IPv4 addresses only"),
174 TRANSPORT_FAMILY_IPV4),
175 OPT_SET_INT('6', "ipv6", &family, N_("use IPv6 addresses only"),
176 TRANSPORT_FAMILY_IPV6),
177 OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options),
181 static void unlock_pack(void)
184 transport_unlock_pack(gtransport);
186 transport_unlock_pack(gsecondary);
189 static void unlock_pack_on_signal(int signo)
196 static void add_merge_config(struct ref **head,
197 const struct ref *remote_refs,
198 struct branch *branch,
203 for (i = 0; i < branch->merge_nr; i++) {
204 struct ref *rm, **old_tail = *tail;
205 struct refspec refspec;
207 for (rm = *head; rm; rm = rm->next) {
208 if (branch_merge_matches(branch, i, rm->name)) {
209 rm->fetch_head_status = FETCH_HEAD_MERGE;
217 * Not fetched to a remote-tracking branch? We need to fetch
218 * it anyway to allow this branch's "branch.$name.merge"
219 * to be honored by 'git pull', but we do not have to
220 * fail if branch.$name.merge is misconfigured to point
221 * at a nonexisting branch. If we were indeed called by
222 * 'git pull', it will notice the misconfiguration because
223 * there is no entry in the resulting FETCH_HEAD marked
226 memset(&refspec, 0, sizeof(refspec));
227 refspec.src = branch->merge[i]->src;
228 get_fetch_map(remote_refs, &refspec, tail, 1);
229 for (rm = *old_tail; rm; rm = rm->next)
230 rm->fetch_head_status = FETCH_HEAD_MERGE;
234 static int add_existing(const char *refname, const struct object_id *oid,
235 int flag, void *cbdata)
237 struct string_list *list = (struct string_list *)cbdata;
238 struct string_list_item *item = string_list_insert(list, refname);
239 struct object_id *old_oid = xmalloc(sizeof(*old_oid));
241 oidcpy(old_oid, oid);
242 item->util = old_oid;
246 static int will_fetch(struct ref **head, const unsigned char *sha1)
248 struct ref *rm = *head;
250 if (!hashcmp(rm->old_oid.hash, sha1))
257 static void find_non_local_tags(struct transport *transport,
261 struct string_list existing_refs = STRING_LIST_INIT_DUP;
262 struct string_list remote_refs = STRING_LIST_INIT_NODUP;
263 const struct ref *ref;
264 struct string_list_item *item = NULL;
266 for_each_ref(add_existing, &existing_refs);
267 for (ref = transport_get_remote_refs(transport, NULL); ref; ref = ref->next) {
268 if (!starts_with(ref->name, "refs/tags/"))
272 * The peeled ref always follows the matching base
273 * ref, so if we see a peeled ref that we don't want
274 * to fetch then we can mark the ref entry in the list
275 * as one to ignore by setting util to NULL.
277 if (ends_with(ref->name, "^{}")) {
279 !has_object_file_with_flags(&ref->old_oid,
280 OBJECT_INFO_QUICK) &&
281 !will_fetch(head, ref->old_oid.hash) &&
282 !has_sha1_file_with_flags(item->util,
283 OBJECT_INFO_QUICK) &&
284 !will_fetch(head, item->util))
291 * If item is non-NULL here, then we previously saw a
292 * ref not followed by a peeled reference, so we need
293 * to check if it is a lightweight tag that we want to
297 !has_sha1_file_with_flags(item->util, OBJECT_INFO_QUICK) &&
298 !will_fetch(head, item->util))
303 /* skip duplicates and refs that we already have */
304 if (string_list_has_string(&remote_refs, ref->name) ||
305 string_list_has_string(&existing_refs, ref->name))
308 item = string_list_insert(&remote_refs, ref->name);
309 item->util = (void *)&ref->old_oid;
311 string_list_clear(&existing_refs, 1);
314 * We may have a final lightweight tag that needs to be
315 * checked to see if it needs fetching.
318 !has_sha1_file_with_flags(item->util, OBJECT_INFO_QUICK) &&
319 !will_fetch(head, item->util))
323 * For all the tags in the remote_refs string list,
324 * add them to the list of refs to be fetched
326 for_each_string_list_item(item, &remote_refs) {
327 /* Unless we have already decided to ignore this item... */
330 struct ref *rm = alloc_ref(item->string);
331 rm->peer_ref = alloc_ref(item->string);
332 oidcpy(&rm->old_oid, item->util);
338 string_list_clear(&remote_refs, 0);
341 static struct ref *get_ref_map(struct transport *transport,
342 struct refspec *refspecs, int refspec_count,
343 int tags, int *autotags)
347 struct ref *ref_map = NULL;
348 struct ref **tail = &ref_map;
349 struct argv_array ref_prefixes = ARGV_ARRAY_INIT;
351 /* opportunistically-updated references: */
352 struct ref *orefs = NULL, **oref_tail = &orefs;
354 const struct ref *remote_refs;
356 for (i = 0; i < refspec_count; i++) {
357 if (!refspecs[i].exact_sha1) {
358 const char *glob = strchr(refspecs[i].src, '*');
360 argv_array_pushf(&ref_prefixes, "%.*s",
361 (int)(glob - refspecs[i].src),
364 expand_ref_prefix(&ref_prefixes, refspecs[i].src);
368 remote_refs = transport_get_remote_refs(transport, &ref_prefixes);
370 argv_array_clear(&ref_prefixes);
373 struct refspec *fetch_refspec;
374 int fetch_refspec_nr;
376 for (i = 0; i < refspec_count; i++) {
377 get_fetch_map(remote_refs, &refspecs[i], &tail, 0);
378 if (refspecs[i].dst && refspecs[i].dst[0])
381 /* Merge everything on the command line (but not --tags) */
382 for (rm = ref_map; rm; rm = rm->next)
383 rm->fetch_head_status = FETCH_HEAD_MERGE;
386 * For any refs that we happen to be fetching via
387 * command-line arguments, the destination ref might
388 * have been missing or have been different than the
389 * remote-tracking ref that would be derived from the
390 * configured refspec. In these cases, we want to
391 * take the opportunity to update their configured
392 * remote-tracking reference. However, we do not want
393 * to mention these entries in FETCH_HEAD at all, as
394 * they would simply be duplicates of existing
395 * entries, so we set them FETCH_HEAD_IGNORE below.
397 * We compute these entries now, based only on the
398 * refspecs specified on the command line. But we add
399 * them to the list following the refspecs resulting
400 * from the tags option so that one of the latter,
401 * which has FETCH_HEAD_NOT_FOR_MERGE, is not removed
402 * by ref_remove_duplicates() in favor of one of these
403 * opportunistic entries with FETCH_HEAD_IGNORE.
406 fetch_refspec = parse_fetch_refspec(refmap_nr, refmap_array);
407 fetch_refspec_nr = refmap_nr;
409 fetch_refspec = transport->remote->fetch;
410 fetch_refspec_nr = transport->remote->fetch_refspec_nr;
413 for (i = 0; i < fetch_refspec_nr; i++)
414 get_fetch_map(ref_map, &fetch_refspec[i], &oref_tail, 1);
415 } else if (refmap_array) {
416 die("--refmap option is only meaningful with command-line refspec(s).");
418 /* Use the defaults */
419 struct remote *remote = transport->remote;
420 struct branch *branch = branch_get(NULL);
421 int has_merge = branch_has_merge_config(branch);
423 (remote->fetch_refspec_nr ||
424 /* Note: has_merge implies non-NULL branch->remote_name */
425 (has_merge && !strcmp(branch->remote_name, remote->name)))) {
426 for (i = 0; i < remote->fetch_refspec_nr; i++) {
427 get_fetch_map(remote_refs, &remote->fetch[i], &tail, 0);
428 if (remote->fetch[i].dst &&
429 remote->fetch[i].dst[0])
431 if (!i && !has_merge && ref_map &&
432 !remote->fetch[0].pattern)
433 ref_map->fetch_head_status = FETCH_HEAD_MERGE;
436 * if the remote we're fetching from is the same
437 * as given in branch.<name>.remote, we add the
438 * ref given in branch.<name>.merge, too.
440 * Note: has_merge implies non-NULL branch->remote_name
443 !strcmp(branch->remote_name, remote->name))
444 add_merge_config(&ref_map, remote_refs, branch, &tail);
446 ref_map = get_remote_ref(remote_refs, "HEAD");
448 die(_("Couldn't find remote ref HEAD"));
449 ref_map->fetch_head_status = FETCH_HEAD_MERGE;
450 tail = &ref_map->next;
454 if (tags == TAGS_SET)
455 /* also fetch all tags */
456 get_fetch_map(remote_refs, tag_refspec, &tail, 0);
457 else if (tags == TAGS_DEFAULT && *autotags)
458 find_non_local_tags(transport, &ref_map, &tail);
460 /* Now append any refs to be updated opportunistically: */
462 for (rm = orefs; rm; rm = rm->next) {
463 rm->fetch_head_status = FETCH_HEAD_IGNORE;
467 return ref_remove_duplicates(ref_map);
470 #define STORE_REF_ERROR_OTHER 1
471 #define STORE_REF_ERROR_DF_CONFLICT 2
473 static int s_update_ref(const char *action,
478 char *rla = getenv("GIT_REFLOG_ACTION");
479 struct ref_transaction *transaction;
480 struct strbuf err = STRBUF_INIT;
481 int ret, df_conflict = 0;
486 rla = default_rla.buf;
487 msg = xstrfmt("%s: %s", rla, action);
489 transaction = ref_transaction_begin(&err);
491 ref_transaction_update(transaction, ref->name,
493 check_old ? &ref->old_oid : NULL,
497 ret = ref_transaction_commit(transaction, &err);
499 df_conflict = (ret == TRANSACTION_NAME_CONFLICT);
503 ref_transaction_free(transaction);
504 strbuf_release(&err);
508 ref_transaction_free(transaction);
509 error("%s", err.buf);
510 strbuf_release(&err);
512 return df_conflict ? STORE_REF_ERROR_DF_CONFLICT
513 : STORE_REF_ERROR_OTHER;
516 static int refcol_width = 10;
517 static int compact_format;
519 static void adjust_refcol_width(const struct ref *ref)
521 int max, rlen, llen, len;
523 /* uptodate lines are only shown on high verbosity level */
524 if (!verbosity && !oidcmp(&ref->peer_ref->old_oid, &ref->old_oid))
527 max = term_columns();
528 rlen = utf8_strwidth(prettify_refname(ref->name));
530 llen = utf8_strwidth(prettify_refname(ref->peer_ref->name));
533 * rough estimation to see if the output line is too long and
534 * should not be counted (we can't do precise calculation
535 * anyway because we don't know if the error explanation part
536 * will be printed in update_local_ref)
538 if (compact_format) {
542 len = 21 /* flag and summary */ + rlen + 4 /* -> */ + llen;
547 * Not precise calculation for compact mode because '*' can
548 * appear on the left hand side of '->' and shrink the column
551 if (refcol_width < rlen)
555 static void prepare_format_display(struct ref *ref_map)
558 const char *format = "full";
560 git_config_get_string_const("fetch.output", &format);
561 if (!strcasecmp(format, "full"))
563 else if (!strcasecmp(format, "compact"))
566 die(_("configuration fetch.output contains invalid value %s"),
569 for (rm = ref_map; rm; rm = rm->next) {
570 if (rm->status == REF_STATUS_REJECT_SHALLOW ||
572 !strcmp(rm->name, "HEAD"))
575 adjust_refcol_width(rm);
579 static void print_remote_to_local(struct strbuf *display,
580 const char *remote, const char *local)
582 strbuf_addf(display, "%-*s -> %s", refcol_width, remote, local);
585 static int find_and_replace(struct strbuf *haystack,
587 const char *placeholder)
589 const char *p = strstr(haystack->buf, needle);
595 if (p > haystack->buf && p[-1] != '/')
599 nlen = strlen(needle);
600 if (plen > nlen && p[nlen] != '/')
603 strbuf_splice(haystack, p - haystack->buf, nlen,
604 placeholder, strlen(placeholder));
608 static void print_compact(struct strbuf *display,
609 const char *remote, const char *local)
611 struct strbuf r = STRBUF_INIT;
612 struct strbuf l = STRBUF_INIT;
614 if (!strcmp(remote, local)) {
615 strbuf_addf(display, "%-*s -> *", refcol_width, remote);
619 strbuf_addstr(&r, remote);
620 strbuf_addstr(&l, local);
622 if (!find_and_replace(&r, local, "*"))
623 find_and_replace(&l, remote, "*");
624 print_remote_to_local(display, r.buf, l.buf);
630 static void format_display(struct strbuf *display, char code,
631 const char *summary, const char *error,
632 const char *remote, const char *local,
635 int width = (summary_width + strlen(summary) - gettext_width(summary));
637 strbuf_addf(display, "%c %-*s ", code, width, summary);
639 print_remote_to_local(display, remote, local);
641 print_compact(display, remote, local);
643 strbuf_addf(display, " (%s)", error);
646 static int update_local_ref(struct ref *ref,
648 const struct ref *remote_ref,
649 struct strbuf *display,
652 struct commit *current = NULL, *updated;
653 enum object_type type;
654 struct branch *current_branch = branch_get(NULL);
655 const char *pretty_ref = prettify_refname(ref->name);
657 type = oid_object_info(&ref->new_oid, NULL);
659 die(_("object %s not found"), oid_to_hex(&ref->new_oid));
661 if (!oidcmp(&ref->old_oid, &ref->new_oid)) {
663 format_display(display, '=', _("[up to date]"), NULL,
664 remote, pretty_ref, summary_width);
668 if (current_branch &&
669 !strcmp(ref->name, current_branch->name) &&
670 !(update_head_ok || is_bare_repository()) &&
671 !is_null_oid(&ref->old_oid)) {
673 * If this is the head, and it's not okay to update
674 * the head, and the old value of the head isn't empty...
676 format_display(display, '!', _("[rejected]"),
677 _("can't fetch in current branch"),
678 remote, pretty_ref, summary_width);
682 if (!is_null_oid(&ref->old_oid) &&
683 starts_with(ref->name, "refs/tags/")) {
685 r = s_update_ref("updating tag", ref, 0);
686 format_display(display, r ? '!' : 't', _("[tag update]"),
687 r ? _("unable to update local ref") : NULL,
688 remote, pretty_ref, summary_width);
692 current = lookup_commit_reference_gently(&ref->old_oid, 1);
693 updated = lookup_commit_reference_gently(&ref->new_oid, 1);
694 if (!current || !updated) {
699 * Nicely describe the new ref we're fetching.
700 * Base this on the remote's ref name, as it's
701 * more likely to follow a standard layout.
703 const char *name = remote_ref ? remote_ref->name : "";
704 if (starts_with(name, "refs/tags/")) {
706 what = _("[new tag]");
707 } else if (starts_with(name, "refs/heads/")) {
708 msg = "storing head";
709 what = _("[new branch]");
712 what = _("[new ref]");
715 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
716 (recurse_submodules != RECURSE_SUBMODULES_ON))
717 check_for_new_submodule_commits(&ref->new_oid);
718 r = s_update_ref(msg, ref, 0);
719 format_display(display, r ? '!' : '*', what,
720 r ? _("unable to update local ref") : NULL,
721 remote, pretty_ref, summary_width);
725 if (in_merge_bases(current, updated)) {
726 struct strbuf quickref = STRBUF_INIT;
728 strbuf_add_unique_abbrev(&quickref, ¤t->object.oid, DEFAULT_ABBREV);
729 strbuf_addstr(&quickref, "..");
730 strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
731 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
732 (recurse_submodules != RECURSE_SUBMODULES_ON))
733 check_for_new_submodule_commits(&ref->new_oid);
734 r = s_update_ref("fast-forward", ref, 1);
735 format_display(display, r ? '!' : ' ', quickref.buf,
736 r ? _("unable to update local ref") : NULL,
737 remote, pretty_ref, summary_width);
738 strbuf_release(&quickref);
740 } else if (force || ref->force) {
741 struct strbuf quickref = STRBUF_INIT;
743 strbuf_add_unique_abbrev(&quickref, ¤t->object.oid, DEFAULT_ABBREV);
744 strbuf_addstr(&quickref, "...");
745 strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
746 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
747 (recurse_submodules != RECURSE_SUBMODULES_ON))
748 check_for_new_submodule_commits(&ref->new_oid);
749 r = s_update_ref("forced-update", ref, 1);
750 format_display(display, r ? '!' : '+', quickref.buf,
751 r ? _("unable to update local ref") : _("forced update"),
752 remote, pretty_ref, summary_width);
753 strbuf_release(&quickref);
756 format_display(display, '!', _("[rejected]"), _("non-fast-forward"),
757 remote, pretty_ref, summary_width);
762 static int iterate_ref_map(void *cb_data, struct object_id *oid)
764 struct ref **rm = cb_data;
765 struct ref *ref = *rm;
767 while (ref && ref->status == REF_STATUS_REJECT_SHALLOW)
770 return -1; /* end of the list */
772 oidcpy(oid, &ref->old_oid);
776 static int store_updated_refs(const char *raw_url, const char *remote_name,
780 struct commit *commit;
781 int url_len, i, rc = 0;
782 struct strbuf note = STRBUF_INIT;
783 const char *what, *kind;
786 const char *filename = dry_run ? "/dev/null" : git_path_fetch_head();
788 int summary_width = transport_summary_width(ref_map);
790 fp = fopen(filename, "a");
792 return error_errno(_("cannot open %s"), filename);
795 url = transport_anonymize_url(raw_url);
797 url = xstrdup("foreign");
800 if (check_connected(iterate_ref_map, &rm, NULL)) {
801 rc = error(_("%s did not send all necessary objects\n"), url);
805 prepare_format_display(ref_map);
808 * We do a pass for each fetch_head_status type in their enum order, so
809 * merged entries are written before not-for-merge. That lets readers
810 * use FETCH_HEAD as a refname to refer to the ref to be merged.
812 for (want_status = FETCH_HEAD_MERGE;
813 want_status <= FETCH_HEAD_IGNORE;
815 for (rm = ref_map; rm; rm = rm->next) {
816 struct ref *ref = NULL;
817 const char *merge_status_marker = "";
819 if (rm->status == REF_STATUS_REJECT_SHALLOW) {
820 if (want_status == FETCH_HEAD_MERGE)
821 warning(_("reject %s because shallow roots are not allowed to be updated"),
822 rm->peer_ref ? rm->peer_ref->name : rm->name);
826 commit = lookup_commit_reference_gently(&rm->old_oid,
829 rm->fetch_head_status = FETCH_HEAD_NOT_FOR_MERGE;
831 if (rm->fetch_head_status != want_status)
835 ref = alloc_ref(rm->peer_ref->name);
836 oidcpy(&ref->old_oid, &rm->peer_ref->old_oid);
837 oidcpy(&ref->new_oid, &rm->old_oid);
838 ref->force = rm->peer_ref->force;
842 if (!strcmp(rm->name, "HEAD")) {
846 else if (starts_with(rm->name, "refs/heads/")) {
848 what = rm->name + 11;
850 else if (starts_with(rm->name, "refs/tags/")) {
852 what = rm->name + 10;
854 else if (starts_with(rm->name, "refs/remotes/")) {
855 kind = "remote-tracking branch";
856 what = rm->name + 13;
863 url_len = strlen(url);
864 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
867 if (4 < i && !strncmp(".git", url + i - 3, 4))
873 strbuf_addf(¬e, "%s ", kind);
874 strbuf_addf(¬e, "'%s' of ", what);
876 switch (rm->fetch_head_status) {
877 case FETCH_HEAD_NOT_FOR_MERGE:
878 merge_status_marker = "not-for-merge";
880 case FETCH_HEAD_MERGE:
881 fprintf(fp, "%s\t%s\t%s",
882 oid_to_hex(&rm->old_oid),
885 for (i = 0; i < url_len; ++i)
893 /* do not write anything to FETCH_HEAD */
899 rc |= update_local_ref(ref, what, rm, ¬e,
903 format_display(¬e, '*',
904 *kind ? kind : "branch", NULL,
905 *what ? what : "HEAD",
906 "FETCH_HEAD", summary_width);
908 if (verbosity >= 0 && !shown_url) {
909 fprintf(stderr, _("From %.*s\n"),
914 fprintf(stderr, " %s\n", note.buf);
919 if (rc & STORE_REF_ERROR_DF_CONFLICT)
920 error(_("some local refs could not be updated; try running\n"
921 " 'git remote prune %s' to remove any old, conflicting "
922 "branches"), remote_name);
925 strbuf_release(¬e);
932 * We would want to bypass the object transfer altogether if
933 * everything we are going to fetch already exists and is connected
936 static int quickfetch(struct ref *ref_map)
938 struct ref *rm = ref_map;
939 struct check_connected_options opt = CHECK_CONNECTED_INIT;
942 * If we are deepening a shallow clone we already have these
943 * objects reachable. Running rev-list here will return with
944 * a good (0) exit status and we'll bypass the fetch that we
945 * really need to perform. Claiming failure now will ensure
946 * we perform the network exchange to deepen our history.
951 return check_connected(iterate_ref_map, &rm, &opt);
954 static int fetch_refs(struct transport *transport, struct ref *ref_map)
956 int ret = quickfetch(ref_map);
958 ret = transport_fetch_refs(transport, ref_map);
960 ret |= store_updated_refs(transport->url,
961 transport->remote->name,
963 transport_unlock_pack(transport);
967 static int prune_refs(struct refspec *refs, int ref_count, struct ref *ref_map,
970 int url_len, i, result = 0;
971 struct ref *ref, *stale_refs = get_stale_heads(refs, ref_count, ref_map);
973 int summary_width = transport_summary_width(stale_refs);
974 const char *dangling_msg = dry_run
975 ? _(" (%s will become dangling)")
976 : _(" (%s has become dangling)");
979 url = transport_anonymize_url(raw_url);
981 url = xstrdup("foreign");
983 url_len = strlen(url);
984 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
988 if (4 < i && !strncmp(".git", url + i - 3, 4))
992 struct string_list refnames = STRING_LIST_INIT_NODUP;
994 for (ref = stale_refs; ref; ref = ref->next)
995 string_list_append(&refnames, ref->name);
997 result = delete_refs("fetch: prune", &refnames, 0);
998 string_list_clear(&refnames, 0);
1001 if (verbosity >= 0) {
1002 for (ref = stale_refs; ref; ref = ref->next) {
1003 struct strbuf sb = STRBUF_INIT;
1005 fprintf(stderr, _("From %.*s\n"), url_len, url);
1008 format_display(&sb, '-', _("[deleted]"), NULL,
1009 _("(none)"), prettify_refname(ref->name),
1011 fprintf(stderr, " %s\n",sb.buf);
1012 strbuf_release(&sb);
1013 warn_dangling_symref(stderr, dangling_msg, ref->name);
1018 free_refs(stale_refs);
1022 static void check_not_current_branch(struct ref *ref_map)
1024 struct branch *current_branch = branch_get(NULL);
1026 if (is_bare_repository() || !current_branch)
1029 for (; ref_map; ref_map = ref_map->next)
1030 if (ref_map->peer_ref && !strcmp(current_branch->refname,
1031 ref_map->peer_ref->name))
1032 die(_("Refusing to fetch into current branch %s "
1033 "of non-bare repository"), current_branch->refname);
1036 static int truncate_fetch_head(void)
1038 const char *filename = git_path_fetch_head();
1039 FILE *fp = fopen_for_writing(filename);
1042 return error_errno(_("cannot open %s"), filename);
1047 static void set_option(struct transport *transport, const char *name, const char *value)
1049 int r = transport_set_option(transport, name, value);
1051 die(_("Option \"%s\" value \"%s\" is not valid for %s"),
1052 name, value, transport->url);
1054 warning(_("Option \"%s\" is ignored for %s\n"),
1055 name, transport->url);
1058 static struct transport *prepare_transport(struct remote *remote, int deepen)
1060 struct transport *transport;
1061 transport = transport_get(remote, NULL);
1062 transport_set_verbosity(transport, verbosity, progress);
1063 transport->family = family;
1065 set_option(transport, TRANS_OPT_UPLOADPACK, upload_pack);
1067 set_option(transport, TRANS_OPT_KEEP, "yes");
1069 set_option(transport, TRANS_OPT_DEPTH, depth);
1070 if (deepen && deepen_since)
1071 set_option(transport, TRANS_OPT_DEEPEN_SINCE, deepen_since);
1072 if (deepen && deepen_not.nr)
1073 set_option(transport, TRANS_OPT_DEEPEN_NOT,
1074 (const char *)&deepen_not);
1075 if (deepen_relative)
1076 set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, "yes");
1078 set_option(transport, TRANS_OPT_UPDATE_SHALLOW, "yes");
1079 if (filter_options.choice) {
1080 set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER,
1081 filter_options.filter_spec);
1082 set_option(transport, TRANS_OPT_FROM_PROMISOR, "1");
1087 static void backfill_tags(struct transport *transport, struct ref *ref_map)
1092 * Once we have set TRANS_OPT_DEEPEN_SINCE, we can't unset it
1093 * when remote helper is used (setting it to an empty string
1094 * is not unsetting). We could extend the remote helper
1095 * protocol for that, but for now, just force a new connection
1096 * without deepen-since. Similar story for deepen-not.
1098 cannot_reuse = transport->cannot_reuse ||
1099 deepen_since || deepen_not.nr;
1101 gsecondary = prepare_transport(transport->remote, 0);
1102 transport = gsecondary;
1105 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
1106 transport_set_option(transport, TRANS_OPT_DEPTH, "0");
1107 transport_set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, NULL);
1108 fetch_refs(transport, ref_map);
1111 transport_disconnect(gsecondary);
1116 static int do_fetch(struct transport *transport,
1117 struct refspec *refs, int ref_count)
1119 struct string_list existing_refs = STRING_LIST_INIT_DUP;
1120 struct ref *ref_map;
1122 int autotags = (transport->remote->fetch_tags == 1);
1125 for_each_ref(add_existing, &existing_refs);
1127 if (tags == TAGS_DEFAULT) {
1128 if (transport->remote->fetch_tags == 2)
1130 if (transport->remote->fetch_tags == -1)
1134 /* if not appending, truncate FETCH_HEAD */
1135 if (!append && !dry_run) {
1136 retcode = truncate_fetch_head();
1141 ref_map = get_ref_map(transport, refs, ref_count, tags, &autotags);
1142 if (!update_head_ok)
1143 check_not_current_branch(ref_map);
1145 for (rm = ref_map; rm; rm = rm->next) {
1147 struct string_list_item *peer_item =
1148 string_list_lookup(&existing_refs,
1149 rm->peer_ref->name);
1151 struct object_id *old_oid = peer_item->util;
1152 oidcpy(&rm->peer_ref->old_oid, old_oid);
1157 if (tags == TAGS_DEFAULT && autotags)
1158 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
1161 * We only prune based on refspecs specified
1162 * explicitly (via command line or configuration); we
1163 * don't care whether --tags was specified.
1166 prune_refs(refs, ref_count, ref_map, transport->url);
1168 prune_refs(transport->remote->fetch,
1169 transport->remote->fetch_refspec_nr,
1174 if (fetch_refs(transport, ref_map)) {
1181 /* if neither --no-tags nor --tags was specified, do automated tag
1183 if (tags == TAGS_DEFAULT && autotags) {
1184 struct ref **tail = &ref_map;
1186 find_non_local_tags(transport, &ref_map, &tail);
1188 backfill_tags(transport, ref_map);
1193 string_list_clear(&existing_refs, 1);
1197 static int get_one_remote_for_fetch(struct remote *remote, void *priv)
1199 struct string_list *list = priv;
1200 if (!remote->skip_default_update)
1201 string_list_append(list, remote->name);
1205 struct remote_group_data {
1207 struct string_list *list;
1210 static int get_remote_group(const char *key, const char *value, void *priv)
1212 struct remote_group_data *g = priv;
1214 if (skip_prefix(key, "remotes.", &key) && !strcmp(key, g->name)) {
1215 /* split list by white space */
1217 size_t wordlen = strcspn(value, " \t\n");
1220 string_list_append_nodup(g->list,
1221 xstrndup(value, wordlen));
1222 value += wordlen + (value[wordlen] != '\0');
1229 static int add_remote_or_group(const char *name, struct string_list *list)
1231 int prev_nr = list->nr;
1232 struct remote_group_data g;
1233 g.name = name; g.list = list;
1235 git_config(get_remote_group, &g);
1236 if (list->nr == prev_nr) {
1237 struct remote *remote = remote_get(name);
1238 if (!remote_is_configured(remote, 0))
1240 string_list_append(list, remote->name);
1245 static void add_options_to_argv(struct argv_array *argv)
1248 argv_array_push(argv, "--dry-run");
1250 argv_array_push(argv, prune ? "--prune" : "--no-prune");
1251 if (prune_tags != -1)
1252 argv_array_push(argv, prune_tags ? "--prune-tags" : "--no-prune-tags");
1254 argv_array_push(argv, "--update-head-ok");
1256 argv_array_push(argv, "--force");
1258 argv_array_push(argv, "--keep");
1259 if (recurse_submodules == RECURSE_SUBMODULES_ON)
1260 argv_array_push(argv, "--recurse-submodules");
1261 else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND)
1262 argv_array_push(argv, "--recurse-submodules=on-demand");
1263 if (tags == TAGS_SET)
1264 argv_array_push(argv, "--tags");
1265 else if (tags == TAGS_UNSET)
1266 argv_array_push(argv, "--no-tags");
1268 argv_array_push(argv, "-v");
1270 argv_array_push(argv, "-v");
1271 else if (verbosity < 0)
1272 argv_array_push(argv, "-q");
1276 static int fetch_multiple(struct string_list *list)
1279 struct argv_array argv = ARGV_ARRAY_INIT;
1281 if (!append && !dry_run) {
1282 int errcode = truncate_fetch_head();
1287 argv_array_pushl(&argv, "fetch", "--append", NULL);
1288 add_options_to_argv(&argv);
1290 for (i = 0; i < list->nr; i++) {
1291 const char *name = list->items[i].string;
1292 argv_array_push(&argv, name);
1294 printf(_("Fetching %s\n"), name);
1295 if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
1296 error(_("Could not fetch %s"), name);
1299 argv_array_pop(&argv);
1302 argv_array_clear(&argv);
1307 * Fetching from the promisor remote should use the given filter-spec
1308 * or inherit the default filter-spec from the config.
1310 static inline void fetch_one_setup_partial(struct remote *remote)
1313 * Explicit --no-filter argument overrides everything, regardless
1314 * of any prior partial clones and fetches.
1316 if (filter_options.no_filter)
1320 * If no prior partial clone/fetch and the current fetch DID NOT
1321 * request a partial-fetch, do a normal fetch.
1323 if (!repository_format_partial_clone && !filter_options.choice)
1327 * If this is the FIRST partial-fetch request, we enable partial
1328 * on this repo and remember the given filter-spec as the default
1329 * for subsequent fetches to this remote.
1331 if (!repository_format_partial_clone && filter_options.choice) {
1332 partial_clone_register(remote->name, &filter_options);
1337 * We are currently limited to only ONE promisor remote and only
1338 * allow partial-fetches from the promisor remote.
1340 if (strcmp(remote->name, repository_format_partial_clone)) {
1341 if (filter_options.choice)
1342 die(_("--filter can only be used with the remote configured in core.partialClone"));
1347 * Do a partial-fetch from the promisor remote using either the
1348 * explicitly given filter-spec or inherit the filter-spec from
1351 if (!filter_options.choice)
1352 partial_clone_get_default_filter_spec(&filter_options);
1356 static int fetch_one(struct remote *remote, int argc, const char **argv, int prune_tags_ok)
1358 static const char **refs = NULL;
1359 struct refspec *refspec;
1363 int maybe_prune_tags;
1364 int remote_via_config = remote_is_configured(remote, 0);
1367 die(_("No remote repository specified. Please, specify either a URL or a\n"
1368 "remote name from which new revisions should be fetched."));
1370 gtransport = prepare_transport(remote, 1);
1373 /* no command line request */
1374 if (0 <= remote->prune)
1375 prune = remote->prune;
1376 else if (0 <= fetch_prune_config)
1377 prune = fetch_prune_config;
1379 prune = PRUNE_BY_DEFAULT;
1382 if (prune_tags < 0) {
1383 /* no command line request */
1384 if (0 <= remote->prune_tags)
1385 prune_tags = remote->prune_tags;
1386 else if (0 <= fetch_prune_tags_config)
1387 prune_tags = fetch_prune_tags_config;
1389 prune_tags = PRUNE_TAGS_BY_DEFAULT;
1392 maybe_prune_tags = prune_tags_ok && prune_tags;
1393 if (maybe_prune_tags && remote_via_config)
1394 add_prune_tags_to_fetch_refspec(remote);
1396 if (argc > 0 || (maybe_prune_tags && !remote_via_config)) {
1397 size_t nr_alloc = st_add3(argc, maybe_prune_tags, 1);
1398 refs = xcalloc(nr_alloc, sizeof(const char *));
1399 if (maybe_prune_tags) {
1400 refs[j++] = xstrdup("refs/tags/*:refs/tags/*");
1407 for (i = 0; i < argc; i++) {
1408 if (!strcmp(argv[i], "tag")) {
1411 die(_("You need to specify a tag name."));
1412 refs[j++] = xstrfmt("refs/tags/%s:refs/tags/%s",
1415 refs[j++] = argv[i];
1420 sigchain_push_common(unlock_pack_on_signal);
1421 atexit(unlock_pack);
1422 refspec = parse_fetch_refspec(ref_nr, refs);
1423 exit_code = do_fetch(gtransport, refspec, ref_nr);
1424 free_refspec(ref_nr, refspec);
1425 transport_disconnect(gtransport);
1430 int cmd_fetch(int argc, const char **argv, const char *prefix)
1433 struct string_list list = STRING_LIST_INIT_DUP;
1434 struct remote *remote = NULL;
1436 int prune_tags_ok = 1;
1437 struct argv_array argv_gc_auto = ARGV_ARRAY_INIT;
1439 packet_trace_identity("fetch");
1441 fetch_if_missing = 0;
1443 /* Record the command line for the reflog */
1444 strbuf_addstr(&default_rla, "fetch");
1445 for (i = 1; i < argc; i++)
1446 strbuf_addf(&default_rla, " %s", argv[i]);
1448 config_from_gitmodules(gitmodules_fetch_config, NULL);
1449 git_config(git_fetch_config, NULL);
1451 argc = parse_options(argc, argv, prefix,
1452 builtin_fetch_options, builtin_fetch_usage, 0);
1454 if (deepen_relative) {
1455 if (deepen_relative < 0)
1456 die(_("Negative depth in --deepen is not supported"));
1458 die(_("--deepen and --depth are mutually exclusive"));
1459 depth = xstrfmt("%d", deepen_relative);
1463 die(_("--depth and --unshallow cannot be used together"));
1464 else if (!is_repository_shallow())
1465 die(_("--unshallow on a complete repository does not make sense"));
1467 depth = xstrfmt("%d", INFINITE_DEPTH);
1470 /* no need to be strict, transport_set_option() will validate it again */
1471 if (depth && atoi(depth) < 1)
1472 die(_("depth %s is not a positive number"), depth);
1473 if (depth || deepen_since || deepen_not.nr)
1476 if (filter_options.choice && !repository_format_partial_clone)
1477 die("--filter can only be used when extensions.partialClone is set");
1481 die(_("fetch --all does not take a repository argument"));
1483 die(_("fetch --all does not make sense with refspecs"));
1484 (void) for_each_remote(get_one_remote_for_fetch, &list);
1485 } else if (argc == 0) {
1486 /* No arguments -- use default remote */
1487 remote = remote_get(NULL);
1488 } else if (multiple) {
1489 /* All arguments are assumed to be remotes or groups */
1490 for (i = 0; i < argc; i++)
1491 if (!add_remote_or_group(argv[i], &list))
1492 die(_("No such remote or remote group: %s"), argv[i]);
1494 /* Single remote or group */
1495 (void) add_remote_or_group(argv[0], &list);
1497 /* More than one remote */
1499 die(_("Fetching a group and specifying refspecs does not make sense"));
1501 /* Zero or one remotes */
1502 remote = remote_get(argv[0]);
1503 prune_tags_ok = (argc == 1);
1510 if (filter_options.choice || repository_format_partial_clone)
1511 fetch_one_setup_partial(remote);
1512 result = fetch_one(remote, argc, argv, prune_tags_ok);
1514 if (filter_options.choice)
1515 die(_("--filter can only be used with the remote configured in core.partialClone"));
1516 /* TODO should this also die if we have a previous partial-clone? */
1517 result = fetch_multiple(&list);
1520 if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
1521 struct argv_array options = ARGV_ARRAY_INIT;
1523 add_options_to_argv(&options);
1524 result = fetch_populated_submodules(the_repository,
1528 recurse_submodules_default,
1531 argv_array_clear(&options);
1534 string_list_clear(&list, 0);
1536 close_all_packs(the_repository->objects);
1538 argv_array_pushl(&argv_gc_auto, "gc", "--auto", NULL);
1540 argv_array_push(&argv_gc_auto, "--quiet");
1541 run_command_v_opt(argv_gc_auto.argv, RUN_GIT_CMD);
1542 argv_array_clear(&argv_gc_auto);