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); 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;
350 /* opportunistically-updated references: */
351 struct ref *orefs = NULL, **oref_tail = &orefs;
353 const struct ref *remote_refs = transport_get_remote_refs(transport);
356 struct refspec *fetch_refspec;
357 int fetch_refspec_nr;
359 for (i = 0; i < refspec_count; i++) {
360 get_fetch_map(remote_refs, &refspecs[i], &tail, 0);
361 if (refspecs[i].dst && refspecs[i].dst[0])
364 /* Merge everything on the command line (but not --tags) */
365 for (rm = ref_map; rm; rm = rm->next)
366 rm->fetch_head_status = FETCH_HEAD_MERGE;
369 * For any refs that we happen to be fetching via
370 * command-line arguments, the destination ref might
371 * have been missing or have been different than the
372 * remote-tracking ref that would be derived from the
373 * configured refspec. In these cases, we want to
374 * take the opportunity to update their configured
375 * remote-tracking reference. However, we do not want
376 * to mention these entries in FETCH_HEAD at all, as
377 * they would simply be duplicates of existing
378 * entries, so we set them FETCH_HEAD_IGNORE below.
380 * We compute these entries now, based only on the
381 * refspecs specified on the command line. But we add
382 * them to the list following the refspecs resulting
383 * from the tags option so that one of the latter,
384 * which has FETCH_HEAD_NOT_FOR_MERGE, is not removed
385 * by ref_remove_duplicates() in favor of one of these
386 * opportunistic entries with FETCH_HEAD_IGNORE.
389 fetch_refspec = parse_fetch_refspec(refmap_nr, refmap_array);
390 fetch_refspec_nr = refmap_nr;
392 fetch_refspec = transport->remote->fetch;
393 fetch_refspec_nr = transport->remote->fetch_refspec_nr;
396 for (i = 0; i < fetch_refspec_nr; i++)
397 get_fetch_map(ref_map, &fetch_refspec[i], &oref_tail, 1);
398 } else if (refmap_array) {
399 die("--refmap option is only meaningful with command-line refspec(s).");
401 /* Use the defaults */
402 struct remote *remote = transport->remote;
403 struct branch *branch = branch_get(NULL);
404 int has_merge = branch_has_merge_config(branch);
406 (remote->fetch_refspec_nr ||
407 /* Note: has_merge implies non-NULL branch->remote_name */
408 (has_merge && !strcmp(branch->remote_name, remote->name)))) {
409 for (i = 0; i < remote->fetch_refspec_nr; i++) {
410 get_fetch_map(remote_refs, &remote->fetch[i], &tail, 0);
411 if (remote->fetch[i].dst &&
412 remote->fetch[i].dst[0])
414 if (!i && !has_merge && ref_map &&
415 !remote->fetch[0].pattern)
416 ref_map->fetch_head_status = FETCH_HEAD_MERGE;
419 * if the remote we're fetching from is the same
420 * as given in branch.<name>.remote, we add the
421 * ref given in branch.<name>.merge, too.
423 * Note: has_merge implies non-NULL branch->remote_name
426 !strcmp(branch->remote_name, remote->name))
427 add_merge_config(&ref_map, remote_refs, branch, &tail);
429 ref_map = get_remote_ref(remote_refs, "HEAD");
431 die(_("Couldn't find remote ref HEAD"));
432 ref_map->fetch_head_status = FETCH_HEAD_MERGE;
433 tail = &ref_map->next;
437 if (tags == TAGS_SET)
438 /* also fetch all tags */
439 get_fetch_map(remote_refs, tag_refspec, &tail, 0);
440 else if (tags == TAGS_DEFAULT && *autotags)
441 find_non_local_tags(transport, &ref_map, &tail);
443 /* Now append any refs to be updated opportunistically: */
445 for (rm = orefs; rm; rm = rm->next) {
446 rm->fetch_head_status = FETCH_HEAD_IGNORE;
450 return ref_remove_duplicates(ref_map);
453 #define STORE_REF_ERROR_OTHER 1
454 #define STORE_REF_ERROR_DF_CONFLICT 2
456 static int s_update_ref(const char *action,
461 char *rla = getenv("GIT_REFLOG_ACTION");
462 struct ref_transaction *transaction;
463 struct strbuf err = STRBUF_INIT;
464 int ret, df_conflict = 0;
469 rla = default_rla.buf;
470 msg = xstrfmt("%s: %s", rla, action);
472 transaction = ref_transaction_begin(&err);
474 ref_transaction_update(transaction, ref->name,
476 check_old ? &ref->old_oid : NULL,
480 ret = ref_transaction_commit(transaction, &err);
482 df_conflict = (ret == TRANSACTION_NAME_CONFLICT);
486 ref_transaction_free(transaction);
487 strbuf_release(&err);
491 ref_transaction_free(transaction);
492 error("%s", err.buf);
493 strbuf_release(&err);
495 return df_conflict ? STORE_REF_ERROR_DF_CONFLICT
496 : STORE_REF_ERROR_OTHER;
499 static int refcol_width = 10;
500 static int compact_format;
502 static void adjust_refcol_width(const struct ref *ref)
504 int max, rlen, llen, len;
506 /* uptodate lines are only shown on high verbosity level */
507 if (!verbosity && !oidcmp(&ref->peer_ref->old_oid, &ref->old_oid))
510 max = term_columns();
511 rlen = utf8_strwidth(prettify_refname(ref->name));
513 llen = utf8_strwidth(prettify_refname(ref->peer_ref->name));
516 * rough estimation to see if the output line is too long and
517 * should not be counted (we can't do precise calculation
518 * anyway because we don't know if the error explanation part
519 * will be printed in update_local_ref)
521 if (compact_format) {
525 len = 21 /* flag and summary */ + rlen + 4 /* -> */ + llen;
530 * Not precise calculation for compact mode because '*' can
531 * appear on the left hand side of '->' and shrink the column
534 if (refcol_width < rlen)
538 static void prepare_format_display(struct ref *ref_map)
541 const char *format = "full";
543 git_config_get_string_const("fetch.output", &format);
544 if (!strcasecmp(format, "full"))
546 else if (!strcasecmp(format, "compact"))
549 die(_("configuration fetch.output contains invalid value %s"),
552 for (rm = ref_map; rm; rm = rm->next) {
553 if (rm->status == REF_STATUS_REJECT_SHALLOW ||
555 !strcmp(rm->name, "HEAD"))
558 adjust_refcol_width(rm);
562 static void print_remote_to_local(struct strbuf *display,
563 const char *remote, const char *local)
565 strbuf_addf(display, "%-*s -> %s", refcol_width, remote, local);
568 static int find_and_replace(struct strbuf *haystack,
570 const char *placeholder)
572 const char *p = strstr(haystack->buf, needle);
578 if (p > haystack->buf && p[-1] != '/')
582 nlen = strlen(needle);
583 if (plen > nlen && p[nlen] != '/')
586 strbuf_splice(haystack, p - haystack->buf, nlen,
587 placeholder, strlen(placeholder));
591 static void print_compact(struct strbuf *display,
592 const char *remote, const char *local)
594 struct strbuf r = STRBUF_INIT;
595 struct strbuf l = STRBUF_INIT;
597 if (!strcmp(remote, local)) {
598 strbuf_addf(display, "%-*s -> *", refcol_width, remote);
602 strbuf_addstr(&r, remote);
603 strbuf_addstr(&l, local);
605 if (!find_and_replace(&r, local, "*"))
606 find_and_replace(&l, remote, "*");
607 print_remote_to_local(display, r.buf, l.buf);
613 static void format_display(struct strbuf *display, char code,
614 const char *summary, const char *error,
615 const char *remote, const char *local,
618 int width = (summary_width + strlen(summary) - gettext_width(summary));
620 strbuf_addf(display, "%c %-*s ", code, width, summary);
622 print_remote_to_local(display, remote, local);
624 print_compact(display, remote, local);
626 strbuf_addf(display, " (%s)", error);
629 static int update_local_ref(struct ref *ref,
631 const struct ref *remote_ref,
632 struct strbuf *display,
635 struct commit *current = NULL, *updated;
636 enum object_type type;
637 struct branch *current_branch = branch_get(NULL);
638 const char *pretty_ref = prettify_refname(ref->name);
640 type = oid_object_info(&ref->new_oid, NULL);
642 die(_("object %s not found"), oid_to_hex(&ref->new_oid));
644 if (!oidcmp(&ref->old_oid, &ref->new_oid)) {
646 format_display(display, '=', _("[up to date]"), NULL,
647 remote, pretty_ref, summary_width);
651 if (current_branch &&
652 !strcmp(ref->name, current_branch->name) &&
653 !(update_head_ok || is_bare_repository()) &&
654 !is_null_oid(&ref->old_oid)) {
656 * If this is the head, and it's not okay to update
657 * the head, and the old value of the head isn't empty...
659 format_display(display, '!', _("[rejected]"),
660 _("can't fetch in current branch"),
661 remote, pretty_ref, summary_width);
665 if (!is_null_oid(&ref->old_oid) &&
666 starts_with(ref->name, "refs/tags/")) {
668 r = s_update_ref("updating tag", ref, 0);
669 format_display(display, r ? '!' : 't', _("[tag update]"),
670 r ? _("unable to update local ref") : NULL,
671 remote, pretty_ref, summary_width);
675 current = lookup_commit_reference_gently(&ref->old_oid, 1);
676 updated = lookup_commit_reference_gently(&ref->new_oid, 1);
677 if (!current || !updated) {
682 * Nicely describe the new ref we're fetching.
683 * Base this on the remote's ref name, as it's
684 * more likely to follow a standard layout.
686 const char *name = remote_ref ? remote_ref->name : "";
687 if (starts_with(name, "refs/tags/")) {
689 what = _("[new tag]");
690 } else if (starts_with(name, "refs/heads/")) {
691 msg = "storing head";
692 what = _("[new branch]");
695 what = _("[new ref]");
698 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
699 (recurse_submodules != RECURSE_SUBMODULES_ON))
700 check_for_new_submodule_commits(&ref->new_oid);
701 r = s_update_ref(msg, ref, 0);
702 format_display(display, r ? '!' : '*', what,
703 r ? _("unable to update local ref") : NULL,
704 remote, pretty_ref, summary_width);
708 if (in_merge_bases(current, updated)) {
709 struct strbuf quickref = STRBUF_INIT;
711 strbuf_add_unique_abbrev(&quickref, ¤t->object.oid, DEFAULT_ABBREV);
712 strbuf_addstr(&quickref, "..");
713 strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
714 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
715 (recurse_submodules != RECURSE_SUBMODULES_ON))
716 check_for_new_submodule_commits(&ref->new_oid);
717 r = s_update_ref("fast-forward", ref, 1);
718 format_display(display, r ? '!' : ' ', quickref.buf,
719 r ? _("unable to update local ref") : NULL,
720 remote, pretty_ref, summary_width);
721 strbuf_release(&quickref);
723 } else if (force || ref->force) {
724 struct strbuf quickref = STRBUF_INIT;
726 strbuf_add_unique_abbrev(&quickref, ¤t->object.oid, DEFAULT_ABBREV);
727 strbuf_addstr(&quickref, "...");
728 strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
729 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
730 (recurse_submodules != RECURSE_SUBMODULES_ON))
731 check_for_new_submodule_commits(&ref->new_oid);
732 r = s_update_ref("forced-update", ref, 1);
733 format_display(display, r ? '!' : '+', quickref.buf,
734 r ? _("unable to update local ref") : _("forced update"),
735 remote, pretty_ref, summary_width);
736 strbuf_release(&quickref);
739 format_display(display, '!', _("[rejected]"), _("non-fast-forward"),
740 remote, pretty_ref, summary_width);
745 static int iterate_ref_map(void *cb_data, struct object_id *oid)
747 struct ref **rm = cb_data;
748 struct ref *ref = *rm;
750 while (ref && ref->status == REF_STATUS_REJECT_SHALLOW)
753 return -1; /* end of the list */
755 oidcpy(oid, &ref->old_oid);
759 static int store_updated_refs(const char *raw_url, const char *remote_name,
763 struct commit *commit;
764 int url_len, i, rc = 0;
765 struct strbuf note = STRBUF_INIT;
766 const char *what, *kind;
769 const char *filename = dry_run ? "/dev/null" : git_path_fetch_head();
771 int summary_width = transport_summary_width(ref_map);
773 fp = fopen(filename, "a");
775 return error_errno(_("cannot open %s"), filename);
778 url = transport_anonymize_url(raw_url);
780 url = xstrdup("foreign");
783 if (check_connected(iterate_ref_map, &rm, NULL)) {
784 rc = error(_("%s did not send all necessary objects\n"), url);
788 prepare_format_display(ref_map);
791 * We do a pass for each fetch_head_status type in their enum order, so
792 * merged entries are written before not-for-merge. That lets readers
793 * use FETCH_HEAD as a refname to refer to the ref to be merged.
795 for (want_status = FETCH_HEAD_MERGE;
796 want_status <= FETCH_HEAD_IGNORE;
798 for (rm = ref_map; rm; rm = rm->next) {
799 struct ref *ref = NULL;
800 const char *merge_status_marker = "";
802 if (rm->status == REF_STATUS_REJECT_SHALLOW) {
803 if (want_status == FETCH_HEAD_MERGE)
804 warning(_("reject %s because shallow roots are not allowed to be updated"),
805 rm->peer_ref ? rm->peer_ref->name : rm->name);
809 commit = lookup_commit_reference_gently(&rm->old_oid,
812 rm->fetch_head_status = FETCH_HEAD_NOT_FOR_MERGE;
814 if (rm->fetch_head_status != want_status)
818 ref = alloc_ref(rm->peer_ref->name);
819 oidcpy(&ref->old_oid, &rm->peer_ref->old_oid);
820 oidcpy(&ref->new_oid, &rm->old_oid);
821 ref->force = rm->peer_ref->force;
825 if (!strcmp(rm->name, "HEAD")) {
829 else if (starts_with(rm->name, "refs/heads/")) {
831 what = rm->name + 11;
833 else if (starts_with(rm->name, "refs/tags/")) {
835 what = rm->name + 10;
837 else if (starts_with(rm->name, "refs/remotes/")) {
838 kind = "remote-tracking branch";
839 what = rm->name + 13;
846 url_len = strlen(url);
847 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
850 if (4 < i && !strncmp(".git", url + i - 3, 4))
856 strbuf_addf(¬e, "%s ", kind);
857 strbuf_addf(¬e, "'%s' of ", what);
859 switch (rm->fetch_head_status) {
860 case FETCH_HEAD_NOT_FOR_MERGE:
861 merge_status_marker = "not-for-merge";
863 case FETCH_HEAD_MERGE:
864 fprintf(fp, "%s\t%s\t%s",
865 oid_to_hex(&rm->old_oid),
868 for (i = 0; i < url_len; ++i)
876 /* do not write anything to FETCH_HEAD */
882 rc |= update_local_ref(ref, what, rm, ¬e,
886 format_display(¬e, '*',
887 *kind ? kind : "branch", NULL,
888 *what ? what : "HEAD",
889 "FETCH_HEAD", summary_width);
891 if (verbosity >= 0 && !shown_url) {
892 fprintf(stderr, _("From %.*s\n"),
897 fprintf(stderr, " %s\n", note.buf);
902 if (rc & STORE_REF_ERROR_DF_CONFLICT)
903 error(_("some local refs could not be updated; try running\n"
904 " 'git remote prune %s' to remove any old, conflicting "
905 "branches"), remote_name);
908 strbuf_release(¬e);
915 * We would want to bypass the object transfer altogether if
916 * everything we are going to fetch already exists and is connected
919 static int quickfetch(struct ref *ref_map)
921 struct ref *rm = ref_map;
922 struct check_connected_options opt = CHECK_CONNECTED_INIT;
925 * If we are deepening a shallow clone we already have these
926 * objects reachable. Running rev-list here will return with
927 * a good (0) exit status and we'll bypass the fetch that we
928 * really need to perform. Claiming failure now will ensure
929 * we perform the network exchange to deepen our history.
934 return check_connected(iterate_ref_map, &rm, &opt);
937 static int fetch_refs(struct transport *transport, struct ref *ref_map)
939 int ret = quickfetch(ref_map);
941 ret = transport_fetch_refs(transport, ref_map);
943 ret |= store_updated_refs(transport->url,
944 transport->remote->name,
946 transport_unlock_pack(transport);
950 static int prune_refs(struct refspec *refs, int ref_count, struct ref *ref_map,
953 int url_len, i, result = 0;
954 struct ref *ref, *stale_refs = get_stale_heads(refs, ref_count, ref_map);
956 int summary_width = transport_summary_width(stale_refs);
957 const char *dangling_msg = dry_run
958 ? _(" (%s will become dangling)")
959 : _(" (%s has become dangling)");
962 url = transport_anonymize_url(raw_url);
964 url = xstrdup("foreign");
966 url_len = strlen(url);
967 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
971 if (4 < i && !strncmp(".git", url + i - 3, 4))
975 struct string_list refnames = STRING_LIST_INIT_NODUP;
977 for (ref = stale_refs; ref; ref = ref->next)
978 string_list_append(&refnames, ref->name);
980 result = delete_refs("fetch: prune", &refnames, 0);
981 string_list_clear(&refnames, 0);
984 if (verbosity >= 0) {
985 for (ref = stale_refs; ref; ref = ref->next) {
986 struct strbuf sb = STRBUF_INIT;
988 fprintf(stderr, _("From %.*s\n"), url_len, url);
991 format_display(&sb, '-', _("[deleted]"), NULL,
992 _("(none)"), prettify_refname(ref->name),
994 fprintf(stderr, " %s\n",sb.buf);
996 warn_dangling_symref(stderr, dangling_msg, ref->name);
1001 free_refs(stale_refs);
1005 static void check_not_current_branch(struct ref *ref_map)
1007 struct branch *current_branch = branch_get(NULL);
1009 if (is_bare_repository() || !current_branch)
1012 for (; ref_map; ref_map = ref_map->next)
1013 if (ref_map->peer_ref && !strcmp(current_branch->refname,
1014 ref_map->peer_ref->name))
1015 die(_("Refusing to fetch into current branch %s "
1016 "of non-bare repository"), current_branch->refname);
1019 static int truncate_fetch_head(void)
1021 const char *filename = git_path_fetch_head();
1022 FILE *fp = fopen_for_writing(filename);
1025 return error_errno(_("cannot open %s"), filename);
1030 static void set_option(struct transport *transport, const char *name, const char *value)
1032 int r = transport_set_option(transport, name, value);
1034 die(_("Option \"%s\" value \"%s\" is not valid for %s"),
1035 name, value, transport->url);
1037 warning(_("Option \"%s\" is ignored for %s\n"),
1038 name, transport->url);
1041 static struct transport *prepare_transport(struct remote *remote, int deepen)
1043 struct transport *transport;
1044 transport = transport_get(remote, NULL);
1045 transport_set_verbosity(transport, verbosity, progress);
1046 transport->family = family;
1048 set_option(transport, TRANS_OPT_UPLOADPACK, upload_pack);
1050 set_option(transport, TRANS_OPT_KEEP, "yes");
1052 set_option(transport, TRANS_OPT_DEPTH, depth);
1053 if (deepen && deepen_since)
1054 set_option(transport, TRANS_OPT_DEEPEN_SINCE, deepen_since);
1055 if (deepen && deepen_not.nr)
1056 set_option(transport, TRANS_OPT_DEEPEN_NOT,
1057 (const char *)&deepen_not);
1058 if (deepen_relative)
1059 set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, "yes");
1061 set_option(transport, TRANS_OPT_UPDATE_SHALLOW, "yes");
1062 if (filter_options.choice) {
1063 set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER,
1064 filter_options.filter_spec);
1065 set_option(transport, TRANS_OPT_FROM_PROMISOR, "1");
1070 static void backfill_tags(struct transport *transport, struct ref *ref_map)
1075 * Once we have set TRANS_OPT_DEEPEN_SINCE, we can't unset it
1076 * when remote helper is used (setting it to an empty string
1077 * is not unsetting). We could extend the remote helper
1078 * protocol for that, but for now, just force a new connection
1079 * without deepen-since. Similar story for deepen-not.
1081 cannot_reuse = transport->cannot_reuse ||
1082 deepen_since || deepen_not.nr;
1084 gsecondary = prepare_transport(transport->remote, 0);
1085 transport = gsecondary;
1088 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
1089 transport_set_option(transport, TRANS_OPT_DEPTH, "0");
1090 transport_set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, NULL);
1091 fetch_refs(transport, ref_map);
1094 transport_disconnect(gsecondary);
1099 static int do_fetch(struct transport *transport,
1100 struct refspec *refs, int ref_count)
1102 struct string_list existing_refs = STRING_LIST_INIT_DUP;
1103 struct ref *ref_map;
1105 int autotags = (transport->remote->fetch_tags == 1);
1108 for_each_ref(add_existing, &existing_refs);
1110 if (tags == TAGS_DEFAULT) {
1111 if (transport->remote->fetch_tags == 2)
1113 if (transport->remote->fetch_tags == -1)
1117 /* if not appending, truncate FETCH_HEAD */
1118 if (!append && !dry_run) {
1119 retcode = truncate_fetch_head();
1124 ref_map = get_ref_map(transport, refs, ref_count, tags, &autotags);
1125 if (!update_head_ok)
1126 check_not_current_branch(ref_map);
1128 for (rm = ref_map; rm; rm = rm->next) {
1130 struct string_list_item *peer_item =
1131 string_list_lookup(&existing_refs,
1132 rm->peer_ref->name);
1134 struct object_id *old_oid = peer_item->util;
1135 oidcpy(&rm->peer_ref->old_oid, old_oid);
1140 if (tags == TAGS_DEFAULT && autotags)
1141 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
1144 * We only prune based on refspecs specified
1145 * explicitly (via command line or configuration); we
1146 * don't care whether --tags was specified.
1149 prune_refs(refs, ref_count, ref_map, transport->url);
1151 prune_refs(transport->remote->fetch,
1152 transport->remote->fetch_refspec_nr,
1157 if (fetch_refs(transport, ref_map)) {
1164 /* if neither --no-tags nor --tags was specified, do automated tag
1166 if (tags == TAGS_DEFAULT && autotags) {
1167 struct ref **tail = &ref_map;
1169 find_non_local_tags(transport, &ref_map, &tail);
1171 backfill_tags(transport, ref_map);
1176 string_list_clear(&existing_refs, 1);
1180 static int get_one_remote_for_fetch(struct remote *remote, void *priv)
1182 struct string_list *list = priv;
1183 if (!remote->skip_default_update)
1184 string_list_append(list, remote->name);
1188 struct remote_group_data {
1190 struct string_list *list;
1193 static int get_remote_group(const char *key, const char *value, void *priv)
1195 struct remote_group_data *g = priv;
1197 if (skip_prefix(key, "remotes.", &key) && !strcmp(key, g->name)) {
1198 /* split list by white space */
1200 size_t wordlen = strcspn(value, " \t\n");
1203 string_list_append_nodup(g->list,
1204 xstrndup(value, wordlen));
1205 value += wordlen + (value[wordlen] != '\0');
1212 static int add_remote_or_group(const char *name, struct string_list *list)
1214 int prev_nr = list->nr;
1215 struct remote_group_data g;
1216 g.name = name; g.list = list;
1218 git_config(get_remote_group, &g);
1219 if (list->nr == prev_nr) {
1220 struct remote *remote = remote_get(name);
1221 if (!remote_is_configured(remote, 0))
1223 string_list_append(list, remote->name);
1228 static void add_options_to_argv(struct argv_array *argv)
1231 argv_array_push(argv, "--dry-run");
1233 argv_array_push(argv, prune ? "--prune" : "--no-prune");
1234 if (prune_tags != -1)
1235 argv_array_push(argv, prune_tags ? "--prune-tags" : "--no-prune-tags");
1237 argv_array_push(argv, "--update-head-ok");
1239 argv_array_push(argv, "--force");
1241 argv_array_push(argv, "--keep");
1242 if (recurse_submodules == RECURSE_SUBMODULES_ON)
1243 argv_array_push(argv, "--recurse-submodules");
1244 else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND)
1245 argv_array_push(argv, "--recurse-submodules=on-demand");
1246 if (tags == TAGS_SET)
1247 argv_array_push(argv, "--tags");
1248 else if (tags == TAGS_UNSET)
1249 argv_array_push(argv, "--no-tags");
1251 argv_array_push(argv, "-v");
1253 argv_array_push(argv, "-v");
1254 else if (verbosity < 0)
1255 argv_array_push(argv, "-q");
1259 static int fetch_multiple(struct string_list *list)
1262 struct argv_array argv = ARGV_ARRAY_INIT;
1264 if (!append && !dry_run) {
1265 int errcode = truncate_fetch_head();
1270 argv_array_pushl(&argv, "fetch", "--append", NULL);
1271 add_options_to_argv(&argv);
1273 for (i = 0; i < list->nr; i++) {
1274 const char *name = list->items[i].string;
1275 argv_array_push(&argv, name);
1277 printf(_("Fetching %s\n"), name);
1278 if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
1279 error(_("Could not fetch %s"), name);
1282 argv_array_pop(&argv);
1285 argv_array_clear(&argv);
1290 * Fetching from the promisor remote should use the given filter-spec
1291 * or inherit the default filter-spec from the config.
1293 static inline void fetch_one_setup_partial(struct remote *remote)
1296 * Explicit --no-filter argument overrides everything, regardless
1297 * of any prior partial clones and fetches.
1299 if (filter_options.no_filter)
1303 * If no prior partial clone/fetch and the current fetch DID NOT
1304 * request a partial-fetch, do a normal fetch.
1306 if (!repository_format_partial_clone && !filter_options.choice)
1310 * If this is the FIRST partial-fetch request, we enable partial
1311 * on this repo and remember the given filter-spec as the default
1312 * for subsequent fetches to this remote.
1314 if (!repository_format_partial_clone && filter_options.choice) {
1315 partial_clone_register(remote->name, &filter_options);
1320 * We are currently limited to only ONE promisor remote and only
1321 * allow partial-fetches from the promisor remote.
1323 if (strcmp(remote->name, repository_format_partial_clone)) {
1324 if (filter_options.choice)
1325 die(_("--filter can only be used with the remote configured in core.partialClone"));
1330 * Do a partial-fetch from the promisor remote using either the
1331 * explicitly given filter-spec or inherit the filter-spec from
1334 if (!filter_options.choice)
1335 partial_clone_get_default_filter_spec(&filter_options);
1339 static int fetch_one(struct remote *remote, int argc, const char **argv, int prune_tags_ok)
1341 static const char **refs = NULL;
1342 struct refspec *refspec;
1346 int maybe_prune_tags;
1347 int remote_via_config = remote_is_configured(remote, 0);
1350 die(_("No remote repository specified. Please, specify either a URL or a\n"
1351 "remote name from which new revisions should be fetched."));
1353 gtransport = prepare_transport(remote, 1);
1356 /* no command line request */
1357 if (0 <= remote->prune)
1358 prune = remote->prune;
1359 else if (0 <= fetch_prune_config)
1360 prune = fetch_prune_config;
1362 prune = PRUNE_BY_DEFAULT;
1365 if (prune_tags < 0) {
1366 /* no command line request */
1367 if (0 <= remote->prune_tags)
1368 prune_tags = remote->prune_tags;
1369 else if (0 <= fetch_prune_tags_config)
1370 prune_tags = fetch_prune_tags_config;
1372 prune_tags = PRUNE_TAGS_BY_DEFAULT;
1375 maybe_prune_tags = prune_tags_ok && prune_tags;
1376 if (maybe_prune_tags && remote_via_config)
1377 add_prune_tags_to_fetch_refspec(remote);
1379 if (argc > 0 || (maybe_prune_tags && !remote_via_config)) {
1380 size_t nr_alloc = st_add3(argc, maybe_prune_tags, 1);
1381 refs = xcalloc(nr_alloc, sizeof(const char *));
1382 if (maybe_prune_tags) {
1383 refs[j++] = xstrdup("refs/tags/*:refs/tags/*");
1390 for (i = 0; i < argc; i++) {
1391 if (!strcmp(argv[i], "tag")) {
1394 die(_("You need to specify a tag name."));
1395 refs[j++] = xstrfmt("refs/tags/%s:refs/tags/%s",
1398 refs[j++] = argv[i];
1403 sigchain_push_common(unlock_pack_on_signal);
1404 atexit(unlock_pack);
1405 refspec = parse_fetch_refspec(ref_nr, refs);
1406 exit_code = do_fetch(gtransport, refspec, ref_nr);
1407 free_refspec(ref_nr, refspec);
1408 transport_disconnect(gtransport);
1413 int cmd_fetch(int argc, const char **argv, const char *prefix)
1416 struct string_list list = STRING_LIST_INIT_DUP;
1417 struct remote *remote = NULL;
1419 int prune_tags_ok = 1;
1420 struct argv_array argv_gc_auto = ARGV_ARRAY_INIT;
1422 packet_trace_identity("fetch");
1424 fetch_if_missing = 0;
1426 /* Record the command line for the reflog */
1427 strbuf_addstr(&default_rla, "fetch");
1428 for (i = 1; i < argc; i++)
1429 strbuf_addf(&default_rla, " %s", argv[i]);
1431 config_from_gitmodules(gitmodules_fetch_config, NULL);
1432 git_config(git_fetch_config, NULL);
1434 argc = parse_options(argc, argv, prefix,
1435 builtin_fetch_options, builtin_fetch_usage, 0);
1437 if (deepen_relative) {
1438 if (deepen_relative < 0)
1439 die(_("Negative depth in --deepen is not supported"));
1441 die(_("--deepen and --depth are mutually exclusive"));
1442 depth = xstrfmt("%d", deepen_relative);
1446 die(_("--depth and --unshallow cannot be used together"));
1447 else if (!is_repository_shallow())
1448 die(_("--unshallow on a complete repository does not make sense"));
1450 depth = xstrfmt("%d", INFINITE_DEPTH);
1453 /* no need to be strict, transport_set_option() will validate it again */
1454 if (depth && atoi(depth) < 1)
1455 die(_("depth %s is not a positive number"), depth);
1456 if (depth || deepen_since || deepen_not.nr)
1459 if (filter_options.choice && !repository_format_partial_clone)
1460 die("--filter can only be used when extensions.partialClone is set");
1464 die(_("fetch --all does not take a repository argument"));
1466 die(_("fetch --all does not make sense with refspecs"));
1467 (void) for_each_remote(get_one_remote_for_fetch, &list);
1468 } else if (argc == 0) {
1469 /* No arguments -- use default remote */
1470 remote = remote_get(NULL);
1471 } else if (multiple) {
1472 /* All arguments are assumed to be remotes or groups */
1473 for (i = 0; i < argc; i++)
1474 if (!add_remote_or_group(argv[i], &list))
1475 die(_("No such remote or remote group: %s"), argv[i]);
1477 /* Single remote or group */
1478 (void) add_remote_or_group(argv[0], &list);
1480 /* More than one remote */
1482 die(_("Fetching a group and specifying refspecs does not make sense"));
1484 /* Zero or one remotes */
1485 remote = remote_get(argv[0]);
1486 prune_tags_ok = (argc == 1);
1493 if (filter_options.choice || repository_format_partial_clone)
1494 fetch_one_setup_partial(remote);
1495 result = fetch_one(remote, argc, argv, prune_tags_ok);
1497 if (filter_options.choice)
1498 die(_("--filter can only be used with the remote configured in core.partialClone"));
1499 /* TODO should this also die if we have a previous partial-clone? */
1500 result = fetch_multiple(&list);
1503 if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
1504 struct argv_array options = ARGV_ARRAY_INIT;
1506 add_options_to_argv(&options);
1507 result = fetch_populated_submodules(the_repository,
1511 recurse_submodules_default,
1514 argv_array_clear(&options);
1517 string_list_clear(&list, 0);
1519 close_all_packs(the_repository->objects);
1521 argv_array_pushl(&argv_gc_auto, "gc", "--auto", NULL);
1523 argv_array_push(&argv_gc_auto, "--quiet");
1524 run_command_v_opt(argv_gc_auto.argv, RUN_GIT_CMD);
1525 argv_array_clear(&argv_gc_auto);