6 #include "repository.h"
11 #include "string-list.h"
13 #include "transport.h"
14 #include "run-command.h"
15 #include "parse-options.h"
17 #include "submodule-config.h"
18 #include "submodule.h"
19 #include "connected.h"
20 #include "argv-array.h"
23 #include "list-objects-filter-options.h"
25 static const char * const builtin_fetch_usage[] = {
26 N_("git fetch [<options>] [<repository> [<refspec>...]]"),
27 N_("git fetch [<options>] <group>"),
28 N_("git fetch --multiple [<options>] [(<repository> | <group>)...]"),
29 N_("git fetch --all [<options>]"),
39 static int fetch_prune_config = -1; /* unspecified */
40 static int prune = -1; /* unspecified */
41 #define PRUNE_BY_DEFAULT 0 /* do we prune by default? */
43 static int fetch_prune_tags_config = -1; /* unspecified */
44 static int prune_tags = -1; /* unspecified */
45 #define PRUNE_TAGS_BY_DEFAULT 0 /* do we prune tags by default? */
47 static int all, append, dry_run, force, keep, multiple, update_head_ok, verbosity, deepen_relative;
48 static int progress = -1;
49 static int tags = TAGS_DEFAULT, unshallow, update_shallow, deepen;
50 static int max_children = 1;
51 static enum transport_family family;
52 static const char *depth;
53 static const char *deepen_since;
54 static const char *upload_pack;
55 static struct string_list deepen_not = STRING_LIST_INIT_NODUP;
56 static struct strbuf default_rla = STRBUF_INIT;
57 static struct transport *gtransport;
58 static struct transport *gsecondary;
59 static const char *submodule_prefix = "";
60 static int recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
61 static int recurse_submodules_default = RECURSE_SUBMODULES_ON_DEMAND;
62 static int shown_url = 0;
63 static struct refspec refmap = REFSPEC_INIT_FETCH;
64 static struct list_objects_filter_options filter_options;
65 static struct string_list server_options = STRING_LIST_INIT_DUP;
67 static int git_fetch_config(const char *k, const char *v, void *cb)
69 if (!strcmp(k, "fetch.prune")) {
70 fetch_prune_config = git_config_bool(k, v);
74 if (!strcmp(k, "fetch.prunetags")) {
75 fetch_prune_tags_config = git_config_bool(k, v);
79 if (!strcmp(k, "submodule.recurse")) {
80 int r = git_config_bool(k, v) ?
81 RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;
82 recurse_submodules = r;
85 if (!strcmp(k, "submodule.fetchjobs")) {
86 max_children = parse_submodule_fetchjobs(k, v);
88 } else if (!strcmp(k, "fetch.recursesubmodules")) {
89 recurse_submodules = parse_fetch_recurse_submodules_arg(k, v);
93 return git_default_config(k, v, cb);
96 static int gitmodules_fetch_config(const char *var, const char *value, void *cb)
98 if (!strcmp(var, "submodule.fetchjobs")) {
99 max_children = parse_submodule_fetchjobs(var, value);
101 } else if (!strcmp(var, "fetch.recursesubmodules")) {
102 recurse_submodules = parse_fetch_recurse_submodules_arg(var, value);
109 static int parse_refmap_arg(const struct option *opt, const char *arg, int unset)
112 * "git fetch --refmap='' origin foo"
113 * can be used to tell the command not to store anywhere
115 refspec_append(&refmap, arg);
120 static struct option builtin_fetch_options[] = {
121 OPT__VERBOSITY(&verbosity),
122 OPT_BOOL(0, "all", &all,
123 N_("fetch from all remotes")),
124 OPT_BOOL('a', "append", &append,
125 N_("append to .git/FETCH_HEAD instead of overwriting")),
126 OPT_STRING(0, "upload-pack", &upload_pack, N_("path"),
127 N_("path to upload pack on remote end")),
128 OPT__FORCE(&force, N_("force overwrite of local branch"), 0),
129 OPT_BOOL('m', "multiple", &multiple,
130 N_("fetch from multiple remotes")),
131 OPT_SET_INT('t', "tags", &tags,
132 N_("fetch all tags and associated objects"), TAGS_SET),
133 OPT_SET_INT('n', NULL, &tags,
134 N_("do not fetch all tags (--no-tags)"), TAGS_UNSET),
135 OPT_INTEGER('j', "jobs", &max_children,
136 N_("number of submodules fetched in parallel")),
137 OPT_BOOL('p', "prune", &prune,
138 N_("prune remote-tracking branches no longer on remote")),
139 OPT_BOOL('P', "prune-tags", &prune_tags,
140 N_("prune local tags no longer on remote and clobber changed tags")),
141 { OPTION_CALLBACK, 0, "recurse-submodules", &recurse_submodules, N_("on-demand"),
142 N_("control recursive fetching of submodules"),
143 PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules },
144 OPT_BOOL(0, "dry-run", &dry_run,
146 OPT_BOOL('k', "keep", &keep, N_("keep downloaded pack")),
147 OPT_BOOL('u', "update-head-ok", &update_head_ok,
148 N_("allow updating of HEAD ref")),
149 OPT_BOOL(0, "progress", &progress, N_("force progress reporting")),
150 OPT_STRING(0, "depth", &depth, N_("depth"),
151 N_("deepen history of shallow clone")),
152 OPT_STRING(0, "shallow-since", &deepen_since, N_("time"),
153 N_("deepen history of shallow repository based on time")),
154 OPT_STRING_LIST(0, "shallow-exclude", &deepen_not, N_("revision"),
155 N_("deepen history of shallow clone, excluding rev")),
156 OPT_INTEGER(0, "deepen", &deepen_relative,
157 N_("deepen history of shallow clone")),
158 OPT_SET_INT_F(0, "unshallow", &unshallow,
159 N_("convert to a complete repository"),
161 { OPTION_STRING, 0, "submodule-prefix", &submodule_prefix, N_("dir"),
162 N_("prepend this to submodule path output"), PARSE_OPT_HIDDEN },
163 { OPTION_CALLBACK, 0, "recurse-submodules-default",
164 &recurse_submodules_default, N_("on-demand"),
165 N_("default for recursive fetching of submodules "
166 "(lower priority than config files)"),
167 PARSE_OPT_HIDDEN, option_fetch_parse_recurse_submodules },
168 OPT_BOOL(0, "update-shallow", &update_shallow,
169 N_("accept refs that update .git/shallow")),
170 { OPTION_CALLBACK, 0, "refmap", NULL, N_("refmap"),
171 N_("specify fetch refmap"), PARSE_OPT_NONEG, parse_refmap_arg },
172 OPT_STRING_LIST('o', "server-option", &server_options, N_("server-specific"), N_("option to transmit")),
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_item 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,
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;
357 refspec_ref_prefixes(rs, &ref_prefixes);
358 else if (transport->remote && transport->remote->fetch.nr)
359 refspec_ref_prefixes(&transport->remote->fetch, &ref_prefixes);
361 if (ref_prefixes.argc &&
362 (tags == TAGS_SET || (tags == TAGS_DEFAULT && !rs->nr))) {
363 argv_array_push(&ref_prefixes, "refs/tags/");
366 remote_refs = transport_get_remote_refs(transport, &ref_prefixes);
368 argv_array_clear(&ref_prefixes);
371 struct refspec *fetch_refspec;
373 for (i = 0; i < rs->nr; i++) {
374 get_fetch_map(remote_refs, &rs->items[i], &tail, 0);
375 if (rs->items[i].dst && rs->items[i].dst[0])
378 /* Merge everything on the command line (but not --tags) */
379 for (rm = ref_map; rm; rm = rm->next)
380 rm->fetch_head_status = FETCH_HEAD_MERGE;
383 * For any refs that we happen to be fetching via
384 * command-line arguments, the destination ref might
385 * have been missing or have been different than the
386 * remote-tracking ref that would be derived from the
387 * configured refspec. In these cases, we want to
388 * take the opportunity to update their configured
389 * remote-tracking reference. However, we do not want
390 * to mention these entries in FETCH_HEAD at all, as
391 * they would simply be duplicates of existing
392 * entries, so we set them FETCH_HEAD_IGNORE below.
394 * We compute these entries now, based only on the
395 * refspecs specified on the command line. But we add
396 * them to the list following the refspecs resulting
397 * from the tags option so that one of the latter,
398 * which has FETCH_HEAD_NOT_FOR_MERGE, is not removed
399 * by ref_remove_duplicates() in favor of one of these
400 * opportunistic entries with FETCH_HEAD_IGNORE.
403 fetch_refspec = &refmap;
405 fetch_refspec = &transport->remote->fetch;
407 for (i = 0; i < fetch_refspec->nr; i++)
408 get_fetch_map(ref_map, &fetch_refspec->items[i], &oref_tail, 1);
409 } else if (refmap.nr) {
410 die("--refmap option is only meaningful with command-line refspec(s).");
412 /* Use the defaults */
413 struct remote *remote = transport->remote;
414 struct branch *branch = branch_get(NULL);
415 int has_merge = branch_has_merge_config(branch);
418 /* Note: has_merge implies non-NULL branch->remote_name */
419 (has_merge && !strcmp(branch->remote_name, remote->name)))) {
420 for (i = 0; i < remote->fetch.nr; i++) {
421 get_fetch_map(remote_refs, &remote->fetch.items[i], &tail, 0);
422 if (remote->fetch.items[i].dst &&
423 remote->fetch.items[i].dst[0])
425 if (!i && !has_merge && ref_map &&
426 !remote->fetch.items[0].pattern)
427 ref_map->fetch_head_status = FETCH_HEAD_MERGE;
430 * if the remote we're fetching from is the same
431 * as given in branch.<name>.remote, we add the
432 * ref given in branch.<name>.merge, too.
434 * Note: has_merge implies non-NULL branch->remote_name
437 !strcmp(branch->remote_name, remote->name))
438 add_merge_config(&ref_map, remote_refs, branch, &tail);
440 ref_map = get_remote_ref(remote_refs, "HEAD");
442 die(_("Couldn't find remote ref HEAD"));
443 ref_map->fetch_head_status = FETCH_HEAD_MERGE;
444 tail = &ref_map->next;
448 if (tags == TAGS_SET)
449 /* also fetch all tags */
450 get_fetch_map(remote_refs, tag_refspec, &tail, 0);
451 else if (tags == TAGS_DEFAULT && *autotags)
452 find_non_local_tags(transport, &ref_map, &tail);
454 /* Now append any refs to be updated opportunistically: */
456 for (rm = orefs; rm; rm = rm->next) {
457 rm->fetch_head_status = FETCH_HEAD_IGNORE;
461 return ref_remove_duplicates(ref_map);
464 #define STORE_REF_ERROR_OTHER 1
465 #define STORE_REF_ERROR_DF_CONFLICT 2
467 static int s_update_ref(const char *action,
472 char *rla = getenv("GIT_REFLOG_ACTION");
473 struct ref_transaction *transaction;
474 struct strbuf err = STRBUF_INIT;
475 int ret, df_conflict = 0;
480 rla = default_rla.buf;
481 msg = xstrfmt("%s: %s", rla, action);
483 transaction = ref_transaction_begin(&err);
485 ref_transaction_update(transaction, ref->name,
487 check_old ? &ref->old_oid : NULL,
491 ret = ref_transaction_commit(transaction, &err);
493 df_conflict = (ret == TRANSACTION_NAME_CONFLICT);
497 ref_transaction_free(transaction);
498 strbuf_release(&err);
502 ref_transaction_free(transaction);
503 error("%s", err.buf);
504 strbuf_release(&err);
506 return df_conflict ? STORE_REF_ERROR_DF_CONFLICT
507 : STORE_REF_ERROR_OTHER;
510 static int refcol_width = 10;
511 static int compact_format;
513 static void adjust_refcol_width(const struct ref *ref)
515 int max, rlen, llen, len;
517 /* uptodate lines are only shown on high verbosity level */
518 if (!verbosity && !oidcmp(&ref->peer_ref->old_oid, &ref->old_oid))
521 max = term_columns();
522 rlen = utf8_strwidth(prettify_refname(ref->name));
524 llen = utf8_strwidth(prettify_refname(ref->peer_ref->name));
527 * rough estimation to see if the output line is too long and
528 * should not be counted (we can't do precise calculation
529 * anyway because we don't know if the error explanation part
530 * will be printed in update_local_ref)
532 if (compact_format) {
536 len = 21 /* flag and summary */ + rlen + 4 /* -> */ + llen;
541 * Not precise calculation for compact mode because '*' can
542 * appear on the left hand side of '->' and shrink the column
545 if (refcol_width < rlen)
549 static void prepare_format_display(struct ref *ref_map)
552 const char *format = "full";
554 git_config_get_string_const("fetch.output", &format);
555 if (!strcasecmp(format, "full"))
557 else if (!strcasecmp(format, "compact"))
560 die(_("configuration fetch.output contains invalid value %s"),
563 for (rm = ref_map; rm; rm = rm->next) {
564 if (rm->status == REF_STATUS_REJECT_SHALLOW ||
566 !strcmp(rm->name, "HEAD"))
569 adjust_refcol_width(rm);
573 static void print_remote_to_local(struct strbuf *display,
574 const char *remote, const char *local)
576 strbuf_addf(display, "%-*s -> %s", refcol_width, remote, local);
579 static int find_and_replace(struct strbuf *haystack,
581 const char *placeholder)
583 const char *p = strstr(haystack->buf, needle);
589 if (p > haystack->buf && p[-1] != '/')
593 nlen = strlen(needle);
594 if (plen > nlen && p[nlen] != '/')
597 strbuf_splice(haystack, p - haystack->buf, nlen,
598 placeholder, strlen(placeholder));
602 static void print_compact(struct strbuf *display,
603 const char *remote, const char *local)
605 struct strbuf r = STRBUF_INIT;
606 struct strbuf l = STRBUF_INIT;
608 if (!strcmp(remote, local)) {
609 strbuf_addf(display, "%-*s -> *", refcol_width, remote);
613 strbuf_addstr(&r, remote);
614 strbuf_addstr(&l, local);
616 if (!find_and_replace(&r, local, "*"))
617 find_and_replace(&l, remote, "*");
618 print_remote_to_local(display, r.buf, l.buf);
624 static void format_display(struct strbuf *display, char code,
625 const char *summary, const char *error,
626 const char *remote, const char *local,
629 int width = (summary_width + strlen(summary) - gettext_width(summary));
631 strbuf_addf(display, "%c %-*s ", code, width, summary);
633 print_remote_to_local(display, remote, local);
635 print_compact(display, remote, local);
637 strbuf_addf(display, " (%s)", error);
640 static int update_local_ref(struct ref *ref,
642 const struct ref *remote_ref,
643 struct strbuf *display,
646 struct commit *current = NULL, *updated;
647 enum object_type type;
648 struct branch *current_branch = branch_get(NULL);
649 const char *pretty_ref = prettify_refname(ref->name);
651 type = oid_object_info(the_repository, &ref->new_oid, NULL);
653 die(_("object %s not found"), oid_to_hex(&ref->new_oid));
655 if (!oidcmp(&ref->old_oid, &ref->new_oid)) {
657 format_display(display, '=', _("[up to date]"), NULL,
658 remote, pretty_ref, summary_width);
662 if (current_branch &&
663 !strcmp(ref->name, current_branch->name) &&
664 !(update_head_ok || is_bare_repository()) &&
665 !is_null_oid(&ref->old_oid)) {
667 * If this is the head, and it's not okay to update
668 * the head, and the old value of the head isn't empty...
670 format_display(display, '!', _("[rejected]"),
671 _("can't fetch in current branch"),
672 remote, pretty_ref, summary_width);
676 if (!is_null_oid(&ref->old_oid) &&
677 starts_with(ref->name, "refs/tags/")) {
679 r = s_update_ref("updating tag", ref, 0);
680 format_display(display, r ? '!' : 't', _("[tag update]"),
681 r ? _("unable to update local ref") : NULL,
682 remote, pretty_ref, summary_width);
686 current = lookup_commit_reference_gently(&ref->old_oid, 1);
687 updated = lookup_commit_reference_gently(&ref->new_oid, 1);
688 if (!current || !updated) {
693 * Nicely describe the new ref we're fetching.
694 * Base this on the remote's ref name, as it's
695 * more likely to follow a standard layout.
697 const char *name = remote_ref ? remote_ref->name : "";
698 if (starts_with(name, "refs/tags/")) {
700 what = _("[new tag]");
701 } else if (starts_with(name, "refs/heads/")) {
702 msg = "storing head";
703 what = _("[new branch]");
706 what = _("[new ref]");
709 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
710 (recurse_submodules != RECURSE_SUBMODULES_ON))
711 check_for_new_submodule_commits(&ref->new_oid);
712 r = s_update_ref(msg, ref, 0);
713 format_display(display, r ? '!' : '*', what,
714 r ? _("unable to update local ref") : NULL,
715 remote, pretty_ref, summary_width);
719 if (in_merge_bases(current, updated)) {
720 struct strbuf quickref = STRBUF_INIT;
722 strbuf_add_unique_abbrev(&quickref, ¤t->object.oid, DEFAULT_ABBREV);
723 strbuf_addstr(&quickref, "..");
724 strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
725 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
726 (recurse_submodules != RECURSE_SUBMODULES_ON))
727 check_for_new_submodule_commits(&ref->new_oid);
728 r = s_update_ref("fast-forward", ref, 1);
729 format_display(display, r ? '!' : ' ', quickref.buf,
730 r ? _("unable to update local ref") : NULL,
731 remote, pretty_ref, summary_width);
732 strbuf_release(&quickref);
734 } else if (force || ref->force) {
735 struct strbuf quickref = STRBUF_INIT;
737 strbuf_add_unique_abbrev(&quickref, ¤t->object.oid, DEFAULT_ABBREV);
738 strbuf_addstr(&quickref, "...");
739 strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
740 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
741 (recurse_submodules != RECURSE_SUBMODULES_ON))
742 check_for_new_submodule_commits(&ref->new_oid);
743 r = s_update_ref("forced-update", ref, 1);
744 format_display(display, r ? '!' : '+', quickref.buf,
745 r ? _("unable to update local ref") : _("forced update"),
746 remote, pretty_ref, summary_width);
747 strbuf_release(&quickref);
750 format_display(display, '!', _("[rejected]"), _("non-fast-forward"),
751 remote, pretty_ref, summary_width);
756 static int iterate_ref_map(void *cb_data, struct object_id *oid)
758 struct ref **rm = cb_data;
759 struct ref *ref = *rm;
761 while (ref && ref->status == REF_STATUS_REJECT_SHALLOW)
764 return -1; /* end of the list */
766 oidcpy(oid, &ref->old_oid);
770 static int store_updated_refs(const char *raw_url, const char *remote_name,
774 struct commit *commit;
775 int url_len, i, rc = 0;
776 struct strbuf note = STRBUF_INIT;
777 const char *what, *kind;
780 const char *filename = dry_run ? "/dev/null" : git_path_fetch_head();
782 int summary_width = transport_summary_width(ref_map);
784 fp = fopen(filename, "a");
786 return error_errno(_("cannot open %s"), filename);
789 url = transport_anonymize_url(raw_url);
791 url = xstrdup("foreign");
794 if (check_connected(iterate_ref_map, &rm, NULL)) {
795 rc = error(_("%s did not send all necessary objects\n"), url);
799 prepare_format_display(ref_map);
802 * We do a pass for each fetch_head_status type in their enum order, so
803 * merged entries are written before not-for-merge. That lets readers
804 * use FETCH_HEAD as a refname to refer to the ref to be merged.
806 for (want_status = FETCH_HEAD_MERGE;
807 want_status <= FETCH_HEAD_IGNORE;
809 for (rm = ref_map; rm; rm = rm->next) {
810 struct ref *ref = NULL;
811 const char *merge_status_marker = "";
813 if (rm->status == REF_STATUS_REJECT_SHALLOW) {
814 if (want_status == FETCH_HEAD_MERGE)
815 warning(_("reject %s because shallow roots are not allowed to be updated"),
816 rm->peer_ref ? rm->peer_ref->name : rm->name);
820 commit = lookup_commit_reference_gently(&rm->old_oid,
823 rm->fetch_head_status = FETCH_HEAD_NOT_FOR_MERGE;
825 if (rm->fetch_head_status != want_status)
829 ref = alloc_ref(rm->peer_ref->name);
830 oidcpy(&ref->old_oid, &rm->peer_ref->old_oid);
831 oidcpy(&ref->new_oid, &rm->old_oid);
832 ref->force = rm->peer_ref->force;
836 if (!strcmp(rm->name, "HEAD")) {
840 else if (starts_with(rm->name, "refs/heads/")) {
842 what = rm->name + 11;
844 else if (starts_with(rm->name, "refs/tags/")) {
846 what = rm->name + 10;
848 else if (starts_with(rm->name, "refs/remotes/")) {
849 kind = "remote-tracking branch";
850 what = rm->name + 13;
857 url_len = strlen(url);
858 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
861 if (4 < i && !strncmp(".git", url + i - 3, 4))
867 strbuf_addf(¬e, "%s ", kind);
868 strbuf_addf(¬e, "'%s' of ", what);
870 switch (rm->fetch_head_status) {
871 case FETCH_HEAD_NOT_FOR_MERGE:
872 merge_status_marker = "not-for-merge";
874 case FETCH_HEAD_MERGE:
875 fprintf(fp, "%s\t%s\t%s",
876 oid_to_hex(&rm->old_oid),
879 for (i = 0; i < url_len; ++i)
887 /* do not write anything to FETCH_HEAD */
893 rc |= update_local_ref(ref, what, rm, ¬e,
897 format_display(¬e, '*',
898 *kind ? kind : "branch", NULL,
899 *what ? what : "HEAD",
900 "FETCH_HEAD", summary_width);
902 if (verbosity >= 0 && !shown_url) {
903 fprintf(stderr, _("From %.*s\n"),
908 fprintf(stderr, " %s\n", note.buf);
913 if (rc & STORE_REF_ERROR_DF_CONFLICT)
914 error(_("some local refs could not be updated; try running\n"
915 " 'git remote prune %s' to remove any old, conflicting "
916 "branches"), remote_name);
919 strbuf_release(¬e);
926 * We would want to bypass the object transfer altogether if
927 * everything we are going to fetch already exists and is connected
930 static int quickfetch(struct ref *ref_map)
932 struct ref *rm = ref_map;
933 struct check_connected_options opt = CHECK_CONNECTED_INIT;
936 * If we are deepening a shallow clone we already have these
937 * objects reachable. Running rev-list here will return with
938 * a good (0) exit status and we'll bypass the fetch that we
939 * really need to perform. Claiming failure now will ensure
940 * we perform the network exchange to deepen our history.
945 return check_connected(iterate_ref_map, &rm, &opt);
948 static int fetch_refs(struct transport *transport, struct ref *ref_map)
950 int ret = quickfetch(ref_map);
952 ret = transport_fetch_refs(transport, ref_map);
954 ret |= store_updated_refs(transport->url,
955 transport->remote->name,
957 transport_unlock_pack(transport);
961 static int prune_refs(struct refspec *rs, struct ref *ref_map,
964 int url_len, i, result = 0;
965 struct ref *ref, *stale_refs = get_stale_heads(rs, ref_map);
967 int summary_width = transport_summary_width(stale_refs);
968 const char *dangling_msg = dry_run
969 ? _(" (%s will become dangling)")
970 : _(" (%s has become dangling)");
973 url = transport_anonymize_url(raw_url);
975 url = xstrdup("foreign");
977 url_len = strlen(url);
978 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
982 if (4 < i && !strncmp(".git", url + i - 3, 4))
986 struct string_list refnames = STRING_LIST_INIT_NODUP;
988 for (ref = stale_refs; ref; ref = ref->next)
989 string_list_append(&refnames, ref->name);
991 result = delete_refs("fetch: prune", &refnames, 0);
992 string_list_clear(&refnames, 0);
995 if (verbosity >= 0) {
996 for (ref = stale_refs; ref; ref = ref->next) {
997 struct strbuf sb = STRBUF_INIT;
999 fprintf(stderr, _("From %.*s\n"), url_len, url);
1002 format_display(&sb, '-', _("[deleted]"), NULL,
1003 _("(none)"), prettify_refname(ref->name),
1005 fprintf(stderr, " %s\n",sb.buf);
1006 strbuf_release(&sb);
1007 warn_dangling_symref(stderr, dangling_msg, ref->name);
1012 free_refs(stale_refs);
1016 static void check_not_current_branch(struct ref *ref_map)
1018 struct branch *current_branch = branch_get(NULL);
1020 if (is_bare_repository() || !current_branch)
1023 for (; ref_map; ref_map = ref_map->next)
1024 if (ref_map->peer_ref && !strcmp(current_branch->refname,
1025 ref_map->peer_ref->name))
1026 die(_("Refusing to fetch into current branch %s "
1027 "of non-bare repository"), current_branch->refname);
1030 static int truncate_fetch_head(void)
1032 const char *filename = git_path_fetch_head();
1033 FILE *fp = fopen_for_writing(filename);
1036 return error_errno(_("cannot open %s"), filename);
1041 static void set_option(struct transport *transport, const char *name, const char *value)
1043 int r = transport_set_option(transport, name, value);
1045 die(_("Option \"%s\" value \"%s\" is not valid for %s"),
1046 name, value, transport->url);
1048 warning(_("Option \"%s\" is ignored for %s\n"),
1049 name, transport->url);
1052 static struct transport *prepare_transport(struct remote *remote, int deepen)
1054 struct transport *transport;
1055 transport = transport_get(remote, NULL);
1056 transport_set_verbosity(transport, verbosity, progress);
1057 transport->family = family;
1059 set_option(transport, TRANS_OPT_UPLOADPACK, upload_pack);
1061 set_option(transport, TRANS_OPT_KEEP, "yes");
1063 set_option(transport, TRANS_OPT_DEPTH, depth);
1064 if (deepen && deepen_since)
1065 set_option(transport, TRANS_OPT_DEEPEN_SINCE, deepen_since);
1066 if (deepen && deepen_not.nr)
1067 set_option(transport, TRANS_OPT_DEEPEN_NOT,
1068 (const char *)&deepen_not);
1069 if (deepen_relative)
1070 set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, "yes");
1072 set_option(transport, TRANS_OPT_UPDATE_SHALLOW, "yes");
1073 if (filter_options.choice) {
1074 set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER,
1075 filter_options.filter_spec);
1076 set_option(transport, TRANS_OPT_FROM_PROMISOR, "1");
1081 static void backfill_tags(struct transport *transport, struct ref *ref_map)
1086 * Once we have set TRANS_OPT_DEEPEN_SINCE, we can't unset it
1087 * when remote helper is used (setting it to an empty string
1088 * is not unsetting). We could extend the remote helper
1089 * protocol for that, but for now, just force a new connection
1090 * without deepen-since. Similar story for deepen-not.
1092 cannot_reuse = transport->cannot_reuse ||
1093 deepen_since || deepen_not.nr;
1095 gsecondary = prepare_transport(transport->remote, 0);
1096 transport = gsecondary;
1099 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
1100 transport_set_option(transport, TRANS_OPT_DEPTH, "0");
1101 transport_set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, NULL);
1102 fetch_refs(transport, ref_map);
1105 transport_disconnect(gsecondary);
1110 static int do_fetch(struct transport *transport,
1113 struct string_list existing_refs = STRING_LIST_INIT_DUP;
1114 struct ref *ref_map;
1116 int autotags = (transport->remote->fetch_tags == 1);
1119 for_each_ref(add_existing, &existing_refs);
1121 if (tags == TAGS_DEFAULT) {
1122 if (transport->remote->fetch_tags == 2)
1124 if (transport->remote->fetch_tags == -1)
1128 /* if not appending, truncate FETCH_HEAD */
1129 if (!append && !dry_run) {
1130 retcode = truncate_fetch_head();
1135 ref_map = get_ref_map(transport, rs, tags, &autotags);
1136 if (!update_head_ok)
1137 check_not_current_branch(ref_map);
1139 for (rm = ref_map; rm; rm = rm->next) {
1141 struct string_list_item *peer_item =
1142 string_list_lookup(&existing_refs,
1143 rm->peer_ref->name);
1145 struct object_id *old_oid = peer_item->util;
1146 oidcpy(&rm->peer_ref->old_oid, old_oid);
1151 if (tags == TAGS_DEFAULT && autotags)
1152 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
1155 * We only prune based on refspecs specified
1156 * explicitly (via command line or configuration); we
1157 * don't care whether --tags was specified.
1160 prune_refs(rs, ref_map, transport->url);
1162 prune_refs(&transport->remote->fetch,
1167 if (fetch_refs(transport, ref_map)) {
1174 /* if neither --no-tags nor --tags was specified, do automated tag
1176 if (tags == TAGS_DEFAULT && autotags) {
1177 struct ref **tail = &ref_map;
1179 find_non_local_tags(transport, &ref_map, &tail);
1181 backfill_tags(transport, ref_map);
1186 string_list_clear(&existing_refs, 1);
1190 static int get_one_remote_for_fetch(struct remote *remote, void *priv)
1192 struct string_list *list = priv;
1193 if (!remote->skip_default_update)
1194 string_list_append(list, remote->name);
1198 struct remote_group_data {
1200 struct string_list *list;
1203 static int get_remote_group(const char *key, const char *value, void *priv)
1205 struct remote_group_data *g = priv;
1207 if (skip_prefix(key, "remotes.", &key) && !strcmp(key, g->name)) {
1208 /* split list by white space */
1210 size_t wordlen = strcspn(value, " \t\n");
1213 string_list_append_nodup(g->list,
1214 xstrndup(value, wordlen));
1215 value += wordlen + (value[wordlen] != '\0');
1222 static int add_remote_or_group(const char *name, struct string_list *list)
1224 int prev_nr = list->nr;
1225 struct remote_group_data g;
1226 g.name = name; g.list = list;
1228 git_config(get_remote_group, &g);
1229 if (list->nr == prev_nr) {
1230 struct remote *remote = remote_get(name);
1231 if (!remote_is_configured(remote, 0))
1233 string_list_append(list, remote->name);
1238 static void add_options_to_argv(struct argv_array *argv)
1241 argv_array_push(argv, "--dry-run");
1243 argv_array_push(argv, prune ? "--prune" : "--no-prune");
1244 if (prune_tags != -1)
1245 argv_array_push(argv, prune_tags ? "--prune-tags" : "--no-prune-tags");
1247 argv_array_push(argv, "--update-head-ok");
1249 argv_array_push(argv, "--force");
1251 argv_array_push(argv, "--keep");
1252 if (recurse_submodules == RECURSE_SUBMODULES_ON)
1253 argv_array_push(argv, "--recurse-submodules");
1254 else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND)
1255 argv_array_push(argv, "--recurse-submodules=on-demand");
1256 if (tags == TAGS_SET)
1257 argv_array_push(argv, "--tags");
1258 else if (tags == TAGS_UNSET)
1259 argv_array_push(argv, "--no-tags");
1261 argv_array_push(argv, "-v");
1263 argv_array_push(argv, "-v");
1264 else if (verbosity < 0)
1265 argv_array_push(argv, "-q");
1269 static int fetch_multiple(struct string_list *list)
1272 struct argv_array argv = ARGV_ARRAY_INIT;
1274 if (!append && !dry_run) {
1275 int errcode = truncate_fetch_head();
1280 argv_array_pushl(&argv, "fetch", "--append", NULL);
1281 add_options_to_argv(&argv);
1283 for (i = 0; i < list->nr; i++) {
1284 const char *name = list->items[i].string;
1285 argv_array_push(&argv, name);
1287 printf(_("Fetching %s\n"), name);
1288 if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
1289 error(_("Could not fetch %s"), name);
1292 argv_array_pop(&argv);
1295 argv_array_clear(&argv);
1300 * Fetching from the promisor remote should use the given filter-spec
1301 * or inherit the default filter-spec from the config.
1303 static inline void fetch_one_setup_partial(struct remote *remote)
1306 * Explicit --no-filter argument overrides everything, regardless
1307 * of any prior partial clones and fetches.
1309 if (filter_options.no_filter)
1313 * If no prior partial clone/fetch and the current fetch DID NOT
1314 * request a partial-fetch, do a normal fetch.
1316 if (!repository_format_partial_clone && !filter_options.choice)
1320 * If this is the FIRST partial-fetch request, we enable partial
1321 * on this repo and remember the given filter-spec as the default
1322 * for subsequent fetches to this remote.
1324 if (!repository_format_partial_clone && filter_options.choice) {
1325 partial_clone_register(remote->name, &filter_options);
1330 * We are currently limited to only ONE promisor remote and only
1331 * allow partial-fetches from the promisor remote.
1333 if (strcmp(remote->name, repository_format_partial_clone)) {
1334 if (filter_options.choice)
1335 die(_("--filter can only be used with the remote configured in core.partialClone"));
1340 * Do a partial-fetch from the promisor remote using either the
1341 * explicitly given filter-spec or inherit the filter-spec from
1344 if (!filter_options.choice)
1345 partial_clone_get_default_filter_spec(&filter_options);
1349 static int fetch_one(struct remote *remote, int argc, const char **argv, int prune_tags_ok)
1351 struct refspec rs = REFSPEC_INIT_FETCH;
1354 int maybe_prune_tags;
1355 int remote_via_config = remote_is_configured(remote, 0);
1358 die(_("No remote repository specified. Please, specify either a URL or a\n"
1359 "remote name from which new revisions should be fetched."));
1361 gtransport = prepare_transport(remote, 1);
1364 /* no command line request */
1365 if (0 <= remote->prune)
1366 prune = remote->prune;
1367 else if (0 <= fetch_prune_config)
1368 prune = fetch_prune_config;
1370 prune = PRUNE_BY_DEFAULT;
1373 if (prune_tags < 0) {
1374 /* no command line request */
1375 if (0 <= remote->prune_tags)
1376 prune_tags = remote->prune_tags;
1377 else if (0 <= fetch_prune_tags_config)
1378 prune_tags = fetch_prune_tags_config;
1380 prune_tags = PRUNE_TAGS_BY_DEFAULT;
1383 maybe_prune_tags = prune_tags_ok && prune_tags;
1384 if (maybe_prune_tags && remote_via_config)
1385 refspec_append(&remote->fetch, TAG_REFSPEC);
1387 if (maybe_prune_tags && (argc || !remote_via_config))
1388 refspec_append(&rs, TAG_REFSPEC);
1390 for (i = 0; i < argc; i++) {
1391 if (!strcmp(argv[i], "tag")) {
1395 die(_("You need to specify a tag name."));
1397 tag = xstrfmt("refs/tags/%s:refs/tags/%s",
1399 refspec_append(&rs, tag);
1402 refspec_append(&rs, argv[i]);
1406 if (server_options.nr)
1407 gtransport->server_options = &server_options;
1409 sigchain_push_common(unlock_pack_on_signal);
1410 atexit(unlock_pack);
1411 exit_code = do_fetch(gtransport, &rs);
1413 transport_disconnect(gtransport);
1418 int cmd_fetch(int argc, const char **argv, const char *prefix)
1421 struct string_list list = STRING_LIST_INIT_DUP;
1422 struct remote *remote = NULL;
1424 int prune_tags_ok = 1;
1425 struct argv_array argv_gc_auto = ARGV_ARRAY_INIT;
1427 packet_trace_identity("fetch");
1429 fetch_if_missing = 0;
1431 /* Record the command line for the reflog */
1432 strbuf_addstr(&default_rla, "fetch");
1433 for (i = 1; i < argc; i++)
1434 strbuf_addf(&default_rla, " %s", argv[i]);
1436 config_from_gitmodules(gitmodules_fetch_config, NULL);
1437 git_config(git_fetch_config, NULL);
1439 argc = parse_options(argc, argv, prefix,
1440 builtin_fetch_options, builtin_fetch_usage, 0);
1442 if (deepen_relative) {
1443 if (deepen_relative < 0)
1444 die(_("Negative depth in --deepen is not supported"));
1446 die(_("--deepen and --depth are mutually exclusive"));
1447 depth = xstrfmt("%d", deepen_relative);
1451 die(_("--depth and --unshallow cannot be used together"));
1452 else if (!is_repository_shallow())
1453 die(_("--unshallow on a complete repository does not make sense"));
1455 depth = xstrfmt("%d", INFINITE_DEPTH);
1458 /* no need to be strict, transport_set_option() will validate it again */
1459 if (depth && atoi(depth) < 1)
1460 die(_("depth %s is not a positive number"), depth);
1461 if (depth || deepen_since || deepen_not.nr)
1464 if (filter_options.choice && !repository_format_partial_clone)
1465 die("--filter can only be used when extensions.partialClone is set");
1469 die(_("fetch --all does not take a repository argument"));
1471 die(_("fetch --all does not make sense with refspecs"));
1472 (void) for_each_remote(get_one_remote_for_fetch, &list);
1473 } else if (argc == 0) {
1474 /* No arguments -- use default remote */
1475 remote = remote_get(NULL);
1476 } else if (multiple) {
1477 /* All arguments are assumed to be remotes or groups */
1478 for (i = 0; i < argc; i++)
1479 if (!add_remote_or_group(argv[i], &list))
1480 die(_("No such remote or remote group: %s"), argv[i]);
1482 /* Single remote or group */
1483 (void) add_remote_or_group(argv[0], &list);
1485 /* More than one remote */
1487 die(_("Fetching a group and specifying refspecs does not make sense"));
1489 /* Zero or one remotes */
1490 remote = remote_get(argv[0]);
1491 prune_tags_ok = (argc == 1);
1498 if (filter_options.choice || repository_format_partial_clone)
1499 fetch_one_setup_partial(remote);
1500 result = fetch_one(remote, argc, argv, prune_tags_ok);
1502 if (filter_options.choice)
1503 die(_("--filter can only be used with the remote configured in core.partialClone"));
1504 /* TODO should this also die if we have a previous partial-clone? */
1505 result = fetch_multiple(&list);
1508 if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
1509 struct argv_array options = ARGV_ARRAY_INIT;
1511 add_options_to_argv(&options);
1512 result = fetch_populated_submodules(the_repository,
1516 recurse_submodules_default,
1519 argv_array_clear(&options);
1522 string_list_clear(&list, 0);
1524 close_all_packs(the_repository->objects);
1526 argv_array_pushl(&argv_gc_auto, "gc", "--auto", NULL);
1528 argv_array_push(&argv_gc_auto, "--quiet");
1529 run_command_v_opt(argv_gc_auto.argv, RUN_GIT_CMD);
1530 argv_array_clear(&argv_gc_auto);