6 #include "repository.h"
9 #include "object-store.h"
12 #include "string-list.h"
14 #include "transport.h"
15 #include "run-command.h"
16 #include "parse-options.h"
18 #include "submodule-config.h"
19 #include "submodule.h"
20 #include "connected.h"
21 #include "argv-array.h"
24 #include "list-objects-filter-options.h"
26 static const char * const builtin_fetch_usage[] = {
27 N_("git fetch [<options>] [<repository> [<refspec>...]]"),
28 N_("git fetch [<options>] <group>"),
29 N_("git fetch --multiple [<options>] [(<repository> | <group>)...]"),
30 N_("git fetch --all [<options>]"),
40 static int fetch_prune_config = -1; /* unspecified */
41 static int prune = -1; /* unspecified */
42 #define PRUNE_BY_DEFAULT 0 /* do we prune by default? */
44 static int fetch_prune_tags_config = -1; /* unspecified */
45 static int prune_tags = -1; /* unspecified */
46 #define PRUNE_TAGS_BY_DEFAULT 0 /* do we prune tags by default? */
48 static int all, append, dry_run, force, keep, multiple, update_head_ok, verbosity, deepen_relative;
49 static int progress = -1;
50 static int tags = TAGS_DEFAULT, unshallow, update_shallow, deepen;
51 static int max_children = 1;
52 static enum transport_family family;
53 static const char *depth;
54 static const char *deepen_since;
55 static const char *upload_pack;
56 static struct string_list deepen_not = STRING_LIST_INIT_NODUP;
57 static struct strbuf default_rla = STRBUF_INIT;
58 static struct transport *gtransport;
59 static struct transport *gsecondary;
60 static const char *submodule_prefix = "";
61 static int recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
62 static int recurse_submodules_default = RECURSE_SUBMODULES_ON_DEMAND;
63 static int shown_url = 0;
64 static struct refspec refmap = REFSPEC_INIT_FETCH;
65 static struct list_objects_filter_options filter_options;
66 static struct string_list server_options = STRING_LIST_INIT_DUP;
67 static struct string_list negotiation_tip = STRING_LIST_INIT_NODUP;
69 static int git_fetch_config(const char *k, const char *v, void *cb)
71 if (!strcmp(k, "fetch.prune")) {
72 fetch_prune_config = git_config_bool(k, v);
76 if (!strcmp(k, "fetch.prunetags")) {
77 fetch_prune_tags_config = git_config_bool(k, v);
81 if (!strcmp(k, "submodule.recurse")) {
82 int r = git_config_bool(k, v) ?
83 RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;
84 recurse_submodules = r;
87 if (!strcmp(k, "submodule.fetchjobs")) {
88 max_children = parse_submodule_fetchjobs(k, v);
90 } else if (!strcmp(k, "fetch.recursesubmodules")) {
91 recurse_submodules = parse_fetch_recurse_submodules_arg(k, v);
95 return git_default_config(k, v, cb);
98 static int parse_refmap_arg(const struct option *opt, const char *arg, int unset)
101 * "git fetch --refmap='' origin foo"
102 * can be used to tell the command not to store anywhere
104 refspec_append(&refmap, arg);
109 static struct option builtin_fetch_options[] = {
110 OPT__VERBOSITY(&verbosity),
111 OPT_BOOL(0, "all", &all,
112 N_("fetch from all remotes")),
113 OPT_BOOL('a', "append", &append,
114 N_("append to .git/FETCH_HEAD instead of overwriting")),
115 OPT_STRING(0, "upload-pack", &upload_pack, N_("path"),
116 N_("path to upload pack on remote end")),
117 OPT__FORCE(&force, N_("force overwrite of local branch"), 0),
118 OPT_BOOL('m', "multiple", &multiple,
119 N_("fetch from multiple remotes")),
120 OPT_SET_INT('t', "tags", &tags,
121 N_("fetch all tags and associated objects"), TAGS_SET),
122 OPT_SET_INT('n', NULL, &tags,
123 N_("do not fetch all tags (--no-tags)"), TAGS_UNSET),
124 OPT_INTEGER('j', "jobs", &max_children,
125 N_("number of submodules fetched in parallel")),
126 OPT_BOOL('p', "prune", &prune,
127 N_("prune remote-tracking branches no longer on remote")),
128 OPT_BOOL('P', "prune-tags", &prune_tags,
129 N_("prune local tags no longer on remote and clobber changed tags")),
130 { OPTION_CALLBACK, 0, "recurse-submodules", &recurse_submodules, N_("on-demand"),
131 N_("control recursive fetching of submodules"),
132 PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules },
133 OPT_BOOL(0, "dry-run", &dry_run,
135 OPT_BOOL('k', "keep", &keep, N_("keep downloaded pack")),
136 OPT_BOOL('u', "update-head-ok", &update_head_ok,
137 N_("allow updating of HEAD ref")),
138 OPT_BOOL(0, "progress", &progress, N_("force progress reporting")),
139 OPT_STRING(0, "depth", &depth, N_("depth"),
140 N_("deepen history of shallow clone")),
141 OPT_STRING(0, "shallow-since", &deepen_since, N_("time"),
142 N_("deepen history of shallow repository based on time")),
143 OPT_STRING_LIST(0, "shallow-exclude", &deepen_not, N_("revision"),
144 N_("deepen history of shallow clone, excluding rev")),
145 OPT_INTEGER(0, "deepen", &deepen_relative,
146 N_("deepen history of shallow clone")),
147 OPT_SET_INT_F(0, "unshallow", &unshallow,
148 N_("convert to a complete repository"),
150 { OPTION_STRING, 0, "submodule-prefix", &submodule_prefix, N_("dir"),
151 N_("prepend this to submodule path output"), PARSE_OPT_HIDDEN },
152 { OPTION_CALLBACK, 0, "recurse-submodules-default",
153 &recurse_submodules_default, N_("on-demand"),
154 N_("default for recursive fetching of submodules "
155 "(lower priority than config files)"),
156 PARSE_OPT_HIDDEN, option_fetch_parse_recurse_submodules },
157 OPT_BOOL(0, "update-shallow", &update_shallow,
158 N_("accept refs that update .git/shallow")),
159 { OPTION_CALLBACK, 0, "refmap", NULL, N_("refmap"),
160 N_("specify fetch refmap"), PARSE_OPT_NONEG, parse_refmap_arg },
161 OPT_STRING_LIST('o', "server-option", &server_options, N_("server-specific"), N_("option to transmit")),
162 OPT_SET_INT('4', "ipv4", &family, N_("use IPv4 addresses only"),
163 TRANSPORT_FAMILY_IPV4),
164 OPT_SET_INT('6', "ipv6", &family, N_("use IPv6 addresses only"),
165 TRANSPORT_FAMILY_IPV6),
166 OPT_STRING_LIST(0, "negotiation-tip", &negotiation_tip, N_("revision"),
167 N_("report that we have only objects reachable from this object")),
168 OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options),
172 static void unlock_pack(void)
175 transport_unlock_pack(gtransport);
177 transport_unlock_pack(gsecondary);
180 static void unlock_pack_on_signal(int signo)
187 static void add_merge_config(struct ref **head,
188 const struct ref *remote_refs,
189 struct branch *branch,
194 for (i = 0; i < branch->merge_nr; i++) {
195 struct ref *rm, **old_tail = *tail;
196 struct refspec_item refspec;
198 for (rm = *head; rm; rm = rm->next) {
199 if (branch_merge_matches(branch, i, rm->name)) {
200 rm->fetch_head_status = FETCH_HEAD_MERGE;
208 * Not fetched to a remote-tracking branch? We need to fetch
209 * it anyway to allow this branch's "branch.$name.merge"
210 * to be honored by 'git pull', but we do not have to
211 * fail if branch.$name.merge is misconfigured to point
212 * at a nonexisting branch. If we were indeed called by
213 * 'git pull', it will notice the misconfiguration because
214 * there is no entry in the resulting FETCH_HEAD marked
217 memset(&refspec, 0, sizeof(refspec));
218 refspec.src = branch->merge[i]->src;
219 get_fetch_map(remote_refs, &refspec, tail, 1);
220 for (rm = *old_tail; rm; rm = rm->next)
221 rm->fetch_head_status = FETCH_HEAD_MERGE;
225 static int add_existing(const char *refname, const struct object_id *oid,
226 int flag, void *cbdata)
228 struct string_list *list = (struct string_list *)cbdata;
229 struct string_list_item *item = string_list_insert(list, refname);
230 struct object_id *old_oid = xmalloc(sizeof(*old_oid));
232 oidcpy(old_oid, oid);
233 item->util = old_oid;
237 static int will_fetch(struct ref **head, const unsigned char *sha1)
239 struct ref *rm = *head;
241 if (!hashcmp(rm->old_oid.hash, sha1))
248 static void find_non_local_tags(const struct ref *refs,
252 struct string_list existing_refs = STRING_LIST_INIT_DUP;
253 struct string_list remote_refs = STRING_LIST_INIT_NODUP;
254 const struct ref *ref;
255 struct string_list_item *item = NULL;
257 for_each_ref(add_existing, &existing_refs);
258 for (ref = refs; ref; ref = ref->next) {
259 if (!starts_with(ref->name, "refs/tags/"))
263 * The peeled ref always follows the matching base
264 * ref, so if we see a peeled ref that we don't want
265 * to fetch then we can mark the ref entry in the list
266 * as one to ignore by setting util to NULL.
268 if (ends_with(ref->name, "^{}")) {
270 !has_object_file_with_flags(&ref->old_oid,
271 OBJECT_INFO_QUICK) &&
272 !will_fetch(head, ref->old_oid.hash) &&
273 !has_sha1_file_with_flags(item->util,
274 OBJECT_INFO_QUICK) &&
275 !will_fetch(head, item->util))
282 * If item is non-NULL here, then we previously saw a
283 * ref not followed by a peeled reference, so we need
284 * to check if it is a lightweight tag that we want to
288 !has_sha1_file_with_flags(item->util, OBJECT_INFO_QUICK) &&
289 !will_fetch(head, item->util))
294 /* skip duplicates and refs that we already have */
295 if (string_list_has_string(&remote_refs, ref->name) ||
296 string_list_has_string(&existing_refs, ref->name))
299 item = string_list_insert(&remote_refs, ref->name);
300 item->util = (void *)&ref->old_oid;
302 string_list_clear(&existing_refs, 1);
305 * We may have a final lightweight tag that needs to be
306 * checked to see if it needs fetching.
309 !has_sha1_file_with_flags(item->util, OBJECT_INFO_QUICK) &&
310 !will_fetch(head, item->util))
314 * For all the tags in the remote_refs string list,
315 * add them to the list of refs to be fetched
317 for_each_string_list_item(item, &remote_refs) {
318 /* Unless we have already decided to ignore this item... */
321 struct ref *rm = alloc_ref(item->string);
322 rm->peer_ref = alloc_ref(item->string);
323 oidcpy(&rm->old_oid, item->util);
329 string_list_clear(&remote_refs, 0);
332 static struct ref *get_ref_map(struct remote *remote,
333 const struct ref *remote_refs,
335 int tags, int *autotags)
339 struct ref *ref_map = NULL;
340 struct ref **tail = &ref_map;
342 /* opportunistically-updated references: */
343 struct ref *orefs = NULL, **oref_tail = &orefs;
345 struct string_list existing_refs = STRING_LIST_INIT_DUP;
348 struct refspec *fetch_refspec;
350 for (i = 0; i < rs->nr; i++) {
351 get_fetch_map(remote_refs, &rs->items[i], &tail, 0);
352 if (rs->items[i].dst && rs->items[i].dst[0])
355 /* Merge everything on the command line (but not --tags) */
356 for (rm = ref_map; rm; rm = rm->next)
357 rm->fetch_head_status = FETCH_HEAD_MERGE;
360 * For any refs that we happen to be fetching via
361 * command-line arguments, the destination ref might
362 * have been missing or have been different than the
363 * remote-tracking ref that would be derived from the
364 * configured refspec. In these cases, we want to
365 * take the opportunity to update their configured
366 * remote-tracking reference. However, we do not want
367 * to mention these entries in FETCH_HEAD at all, as
368 * they would simply be duplicates of existing
369 * entries, so we set them FETCH_HEAD_IGNORE below.
371 * We compute these entries now, based only on the
372 * refspecs specified on the command line. But we add
373 * them to the list following the refspecs resulting
374 * from the tags option so that one of the latter,
375 * which has FETCH_HEAD_NOT_FOR_MERGE, is not removed
376 * by ref_remove_duplicates() in favor of one of these
377 * opportunistic entries with FETCH_HEAD_IGNORE.
380 fetch_refspec = &refmap;
382 fetch_refspec = &remote->fetch;
384 for (i = 0; i < fetch_refspec->nr; i++)
385 get_fetch_map(ref_map, &fetch_refspec->items[i], &oref_tail, 1);
386 } else if (refmap.nr) {
387 die("--refmap option is only meaningful with command-line refspec(s).");
389 /* Use the defaults */
390 struct branch *branch = branch_get(NULL);
391 int has_merge = branch_has_merge_config(branch);
394 /* Note: has_merge implies non-NULL branch->remote_name */
395 (has_merge && !strcmp(branch->remote_name, remote->name)))) {
396 for (i = 0; i < remote->fetch.nr; i++) {
397 get_fetch_map(remote_refs, &remote->fetch.items[i], &tail, 0);
398 if (remote->fetch.items[i].dst &&
399 remote->fetch.items[i].dst[0])
401 if (!i && !has_merge && ref_map &&
402 !remote->fetch.items[0].pattern)
403 ref_map->fetch_head_status = FETCH_HEAD_MERGE;
406 * if the remote we're fetching from is the same
407 * as given in branch.<name>.remote, we add the
408 * ref given in branch.<name>.merge, too.
410 * Note: has_merge implies non-NULL branch->remote_name
413 !strcmp(branch->remote_name, remote->name))
414 add_merge_config(&ref_map, remote_refs, branch, &tail);
416 ref_map = get_remote_ref(remote_refs, "HEAD");
418 die(_("Couldn't find remote ref HEAD"));
419 ref_map->fetch_head_status = FETCH_HEAD_MERGE;
420 tail = &ref_map->next;
424 if (tags == TAGS_SET)
425 /* also fetch all tags */
426 get_fetch_map(remote_refs, tag_refspec, &tail, 0);
427 else if (tags == TAGS_DEFAULT && *autotags)
428 find_non_local_tags(remote_refs, &ref_map, &tail);
430 /* Now append any refs to be updated opportunistically: */
432 for (rm = orefs; rm; rm = rm->next) {
433 rm->fetch_head_status = FETCH_HEAD_IGNORE;
437 ref_map = ref_remove_duplicates(ref_map);
439 for_each_ref(add_existing, &existing_refs);
440 for (rm = ref_map; rm; rm = rm->next) {
442 struct string_list_item *peer_item =
443 string_list_lookup(&existing_refs,
446 struct object_id *old_oid = peer_item->util;
447 oidcpy(&rm->peer_ref->old_oid, old_oid);
451 string_list_clear(&existing_refs, 1);
456 #define STORE_REF_ERROR_OTHER 1
457 #define STORE_REF_ERROR_DF_CONFLICT 2
459 static int s_update_ref(const char *action,
464 char *rla = getenv("GIT_REFLOG_ACTION");
465 struct ref_transaction *transaction;
466 struct strbuf err = STRBUF_INIT;
467 int ret, df_conflict = 0;
472 rla = default_rla.buf;
473 msg = xstrfmt("%s: %s", rla, action);
475 transaction = ref_transaction_begin(&err);
477 ref_transaction_update(transaction, ref->name,
479 check_old ? &ref->old_oid : NULL,
483 ret = ref_transaction_commit(transaction, &err);
485 df_conflict = (ret == TRANSACTION_NAME_CONFLICT);
489 ref_transaction_free(transaction);
490 strbuf_release(&err);
494 ref_transaction_free(transaction);
495 error("%s", err.buf);
496 strbuf_release(&err);
498 return df_conflict ? STORE_REF_ERROR_DF_CONFLICT
499 : STORE_REF_ERROR_OTHER;
502 static int refcol_width = 10;
503 static int compact_format;
505 static void adjust_refcol_width(const struct ref *ref)
507 int max, rlen, llen, len;
509 /* uptodate lines are only shown on high verbosity level */
510 if (!verbosity && !oidcmp(&ref->peer_ref->old_oid, &ref->old_oid))
513 max = term_columns();
514 rlen = utf8_strwidth(prettify_refname(ref->name));
516 llen = utf8_strwidth(prettify_refname(ref->peer_ref->name));
519 * rough estimation to see if the output line is too long and
520 * should not be counted (we can't do precise calculation
521 * anyway because we don't know if the error explanation part
522 * will be printed in update_local_ref)
524 if (compact_format) {
528 len = 21 /* flag and summary */ + rlen + 4 /* -> */ + llen;
533 * Not precise calculation for compact mode because '*' can
534 * appear on the left hand side of '->' and shrink the column
537 if (refcol_width < rlen)
541 static void prepare_format_display(struct ref *ref_map)
544 const char *format = "full";
546 git_config_get_string_const("fetch.output", &format);
547 if (!strcasecmp(format, "full"))
549 else if (!strcasecmp(format, "compact"))
552 die(_("configuration fetch.output contains invalid value %s"),
555 for (rm = ref_map; rm; rm = rm->next) {
556 if (rm->status == REF_STATUS_REJECT_SHALLOW ||
558 !strcmp(rm->name, "HEAD"))
561 adjust_refcol_width(rm);
565 static void print_remote_to_local(struct strbuf *display,
566 const char *remote, const char *local)
568 strbuf_addf(display, "%-*s -> %s", refcol_width, remote, local);
571 static int find_and_replace(struct strbuf *haystack,
573 const char *placeholder)
575 const char *p = strstr(haystack->buf, needle);
581 if (p > haystack->buf && p[-1] != '/')
585 nlen = strlen(needle);
586 if (plen > nlen && p[nlen] != '/')
589 strbuf_splice(haystack, p - haystack->buf, nlen,
590 placeholder, strlen(placeholder));
594 static void print_compact(struct strbuf *display,
595 const char *remote, const char *local)
597 struct strbuf r = STRBUF_INIT;
598 struct strbuf l = STRBUF_INIT;
600 if (!strcmp(remote, local)) {
601 strbuf_addf(display, "%-*s -> *", refcol_width, remote);
605 strbuf_addstr(&r, remote);
606 strbuf_addstr(&l, local);
608 if (!find_and_replace(&r, local, "*"))
609 find_and_replace(&l, remote, "*");
610 print_remote_to_local(display, r.buf, l.buf);
616 static void format_display(struct strbuf *display, char code,
617 const char *summary, const char *error,
618 const char *remote, const char *local,
621 int width = (summary_width + strlen(summary) - gettext_width(summary));
623 strbuf_addf(display, "%c %-*s ", code, width, summary);
625 print_remote_to_local(display, remote, local);
627 print_compact(display, remote, local);
629 strbuf_addf(display, " (%s)", error);
632 static int update_local_ref(struct ref *ref,
634 const struct ref *remote_ref,
635 struct strbuf *display,
638 struct commit *current = NULL, *updated;
639 enum object_type type;
640 struct branch *current_branch = branch_get(NULL);
641 const char *pretty_ref = prettify_refname(ref->name);
643 type = oid_object_info(the_repository, &ref->new_oid, NULL);
645 die(_("object %s not found"), oid_to_hex(&ref->new_oid));
647 if (!oidcmp(&ref->old_oid, &ref->new_oid)) {
649 format_display(display, '=', _("[up to date]"), NULL,
650 remote, pretty_ref, summary_width);
654 if (current_branch &&
655 !strcmp(ref->name, current_branch->name) &&
656 !(update_head_ok || is_bare_repository()) &&
657 !is_null_oid(&ref->old_oid)) {
659 * If this is the head, and it's not okay to update
660 * the head, and the old value of the head isn't empty...
662 format_display(display, '!', _("[rejected]"),
663 _("can't fetch in current branch"),
664 remote, pretty_ref, summary_width);
668 if (!is_null_oid(&ref->old_oid) &&
669 starts_with(ref->name, "refs/tags/")) {
671 r = s_update_ref("updating tag", ref, 0);
672 format_display(display, r ? '!' : 't', _("[tag update]"),
673 r ? _("unable to update local ref") : NULL,
674 remote, pretty_ref, summary_width);
678 current = lookup_commit_reference_gently(the_repository,
680 updated = lookup_commit_reference_gently(the_repository,
682 if (!current || !updated) {
687 * Nicely describe the new ref we're fetching.
688 * Base this on the remote's ref name, as it's
689 * more likely to follow a standard layout.
691 const char *name = remote_ref ? remote_ref->name : "";
692 if (starts_with(name, "refs/tags/")) {
694 what = _("[new tag]");
695 } else if (starts_with(name, "refs/heads/")) {
696 msg = "storing head";
697 what = _("[new branch]");
700 what = _("[new ref]");
703 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
704 (recurse_submodules != RECURSE_SUBMODULES_ON))
705 check_for_new_submodule_commits(&ref->new_oid);
706 r = s_update_ref(msg, ref, 0);
707 format_display(display, r ? '!' : '*', what,
708 r ? _("unable to update local ref") : NULL,
709 remote, pretty_ref, summary_width);
713 if (in_merge_bases(current, updated)) {
714 struct strbuf quickref = STRBUF_INIT;
716 strbuf_add_unique_abbrev(&quickref, ¤t->object.oid, DEFAULT_ABBREV);
717 strbuf_addstr(&quickref, "..");
718 strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
719 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
720 (recurse_submodules != RECURSE_SUBMODULES_ON))
721 check_for_new_submodule_commits(&ref->new_oid);
722 r = s_update_ref("fast-forward", ref, 1);
723 format_display(display, r ? '!' : ' ', quickref.buf,
724 r ? _("unable to update local ref") : NULL,
725 remote, pretty_ref, summary_width);
726 strbuf_release(&quickref);
728 } else if (force || ref->force) {
729 struct strbuf quickref = STRBUF_INIT;
731 strbuf_add_unique_abbrev(&quickref, ¤t->object.oid, DEFAULT_ABBREV);
732 strbuf_addstr(&quickref, "...");
733 strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
734 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
735 (recurse_submodules != RECURSE_SUBMODULES_ON))
736 check_for_new_submodule_commits(&ref->new_oid);
737 r = s_update_ref("forced-update", ref, 1);
738 format_display(display, r ? '!' : '+', quickref.buf,
739 r ? _("unable to update local ref") : _("forced update"),
740 remote, pretty_ref, summary_width);
741 strbuf_release(&quickref);
744 format_display(display, '!', _("[rejected]"), _("non-fast-forward"),
745 remote, pretty_ref, summary_width);
750 static int iterate_ref_map(void *cb_data, struct object_id *oid)
752 struct ref **rm = cb_data;
753 struct ref *ref = *rm;
755 while (ref && ref->status == REF_STATUS_REJECT_SHALLOW)
758 return -1; /* end of the list */
760 oidcpy(oid, &ref->old_oid);
764 static int store_updated_refs(const char *raw_url, const char *remote_name,
765 int connectivity_checked, struct ref *ref_map)
768 struct commit *commit;
769 int url_len, i, rc = 0;
770 struct strbuf note = STRBUF_INIT;
771 const char *what, *kind;
774 const char *filename = dry_run ? "/dev/null" : git_path_fetch_head(the_repository);
776 int summary_width = transport_summary_width(ref_map);
778 fp = fopen(filename, "a");
780 return error_errno(_("cannot open %s"), filename);
783 url = transport_anonymize_url(raw_url);
785 url = xstrdup("foreign");
787 if (!connectivity_checked) {
789 if (check_connected(iterate_ref_map, &rm, NULL)) {
790 rc = error(_("%s did not send all necessary objects\n"), url);
795 prepare_format_display(ref_map);
798 * We do a pass for each fetch_head_status type in their enum order, so
799 * merged entries are written before not-for-merge. That lets readers
800 * use FETCH_HEAD as a refname to refer to the ref to be merged.
802 for (want_status = FETCH_HEAD_MERGE;
803 want_status <= FETCH_HEAD_IGNORE;
805 for (rm = ref_map; rm; rm = rm->next) {
806 struct ref *ref = NULL;
807 const char *merge_status_marker = "";
809 if (rm->status == REF_STATUS_REJECT_SHALLOW) {
810 if (want_status == FETCH_HEAD_MERGE)
811 warning(_("reject %s because shallow roots are not allowed to be updated"),
812 rm->peer_ref ? rm->peer_ref->name : rm->name);
816 commit = lookup_commit_reference_gently(the_repository,
820 rm->fetch_head_status = FETCH_HEAD_NOT_FOR_MERGE;
822 if (rm->fetch_head_status != want_status)
826 ref = alloc_ref(rm->peer_ref->name);
827 oidcpy(&ref->old_oid, &rm->peer_ref->old_oid);
828 oidcpy(&ref->new_oid, &rm->old_oid);
829 ref->force = rm->peer_ref->force;
833 if (!strcmp(rm->name, "HEAD")) {
837 else if (starts_with(rm->name, "refs/heads/")) {
839 what = rm->name + 11;
841 else if (starts_with(rm->name, "refs/tags/")) {
843 what = rm->name + 10;
845 else if (starts_with(rm->name, "refs/remotes/")) {
846 kind = "remote-tracking branch";
847 what = rm->name + 13;
854 url_len = strlen(url);
855 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
858 if (4 < i && !strncmp(".git", url + i - 3, 4))
864 strbuf_addf(¬e, "%s ", kind);
865 strbuf_addf(¬e, "'%s' of ", what);
867 switch (rm->fetch_head_status) {
868 case FETCH_HEAD_NOT_FOR_MERGE:
869 merge_status_marker = "not-for-merge";
871 case FETCH_HEAD_MERGE:
872 fprintf(fp, "%s\t%s\t%s",
873 oid_to_hex(&rm->old_oid),
876 for (i = 0; i < url_len; ++i)
884 /* do not write anything to FETCH_HEAD */
890 rc |= update_local_ref(ref, what, rm, ¬e,
894 format_display(¬e, '*',
895 *kind ? kind : "branch", NULL,
896 *what ? what : "HEAD",
897 "FETCH_HEAD", summary_width);
899 if (verbosity >= 0 && !shown_url) {
900 fprintf(stderr, _("From %.*s\n"),
905 fprintf(stderr, " %s\n", note.buf);
910 if (rc & STORE_REF_ERROR_DF_CONFLICT)
911 error(_("some local refs could not be updated; try running\n"
912 " 'git remote prune %s' to remove any old, conflicting "
913 "branches"), remote_name);
916 strbuf_release(¬e);
923 * We would want to bypass the object transfer altogether if
924 * everything we are going to fetch already exists and is connected
927 static int quickfetch(struct ref *ref_map)
929 struct ref *rm = ref_map;
930 struct check_connected_options opt = CHECK_CONNECTED_INIT;
933 * If we are deepening a shallow clone we already have these
934 * objects reachable. Running rev-list here will return with
935 * a good (0) exit status and we'll bypass the fetch that we
936 * really need to perform. Claiming failure now will ensure
937 * we perform the network exchange to deepen our history.
942 return check_connected(iterate_ref_map, &rm, &opt);
945 static int fetch_refs(struct transport *transport, struct ref *ref_map)
947 int ret = quickfetch(ref_map);
949 ret = transport_fetch_refs(transport, ref_map);
952 * Keep the new pack's ".keep" file around to allow the caller
953 * time to update refs to reference the new objects.
956 transport_unlock_pack(transport);
960 /* Update local refs based on the ref values fetched from a remote */
961 static int consume_refs(struct transport *transport, struct ref *ref_map)
963 int connectivity_checked = transport->smart_options
964 ? transport->smart_options->connectivity_checked : 0;
965 int ret = store_updated_refs(transport->url,
966 transport->remote->name,
967 connectivity_checked,
969 transport_unlock_pack(transport);
973 static int prune_refs(struct refspec *rs, struct ref *ref_map,
976 int url_len, i, result = 0;
977 struct ref *ref, *stale_refs = get_stale_heads(rs, ref_map);
979 int summary_width = transport_summary_width(stale_refs);
980 const char *dangling_msg = dry_run
981 ? _(" (%s will become dangling)")
982 : _(" (%s has become dangling)");
985 url = transport_anonymize_url(raw_url);
987 url = xstrdup("foreign");
989 url_len = strlen(url);
990 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
994 if (4 < i && !strncmp(".git", url + i - 3, 4))
998 struct string_list refnames = STRING_LIST_INIT_NODUP;
1000 for (ref = stale_refs; ref; ref = ref->next)
1001 string_list_append(&refnames, ref->name);
1003 result = delete_refs("fetch: prune", &refnames, 0);
1004 string_list_clear(&refnames, 0);
1007 if (verbosity >= 0) {
1008 for (ref = stale_refs; ref; ref = ref->next) {
1009 struct strbuf sb = STRBUF_INIT;
1011 fprintf(stderr, _("From %.*s\n"), url_len, url);
1014 format_display(&sb, '-', _("[deleted]"), NULL,
1015 _("(none)"), prettify_refname(ref->name),
1017 fprintf(stderr, " %s\n",sb.buf);
1018 strbuf_release(&sb);
1019 warn_dangling_symref(stderr, dangling_msg, ref->name);
1024 free_refs(stale_refs);
1028 static void check_not_current_branch(struct ref *ref_map)
1030 struct branch *current_branch = branch_get(NULL);
1032 if (is_bare_repository() || !current_branch)
1035 for (; ref_map; ref_map = ref_map->next)
1036 if (ref_map->peer_ref && !strcmp(current_branch->refname,
1037 ref_map->peer_ref->name))
1038 die(_("Refusing to fetch into current branch %s "
1039 "of non-bare repository"), current_branch->refname);
1042 static int truncate_fetch_head(void)
1044 const char *filename = git_path_fetch_head(the_repository);
1045 FILE *fp = fopen_for_writing(filename);
1048 return error_errno(_("cannot open %s"), filename);
1053 static void set_option(struct transport *transport, const char *name, const char *value)
1055 int r = transport_set_option(transport, name, value);
1057 die(_("Option \"%s\" value \"%s\" is not valid for %s"),
1058 name, value, transport->url);
1060 warning(_("Option \"%s\" is ignored for %s\n"),
1061 name, transport->url);
1065 static int add_oid(const char *refname, const struct object_id *oid, int flags,
1068 struct oid_array *oids = cb_data;
1070 oid_array_append(oids, oid);
1074 static void add_negotiation_tips(struct git_transport_options *smart_options)
1076 struct oid_array *oids = xcalloc(1, sizeof(*oids));
1079 for (i = 0; i < negotiation_tip.nr; i++) {
1080 const char *s = negotiation_tip.items[i].string;
1082 if (!has_glob_specials(s)) {
1083 struct object_id oid;
1084 if (get_oid(s, &oid))
1085 die("%s is not a valid object", s);
1086 oid_array_append(oids, &oid);
1090 for_each_glob_ref(add_oid, s, oids);
1091 if (old_nr == oids->nr)
1092 warning("Ignoring --negotiation-tip=%s because it does not match any refs",
1095 smart_options->negotiation_tips = oids;
1098 static struct transport *prepare_transport(struct remote *remote, int deepen)
1100 struct transport *transport;
1101 transport = transport_get(remote, NULL);
1102 transport_set_verbosity(transport, verbosity, progress);
1103 transport->family = family;
1105 set_option(transport, TRANS_OPT_UPLOADPACK, upload_pack);
1107 set_option(transport, TRANS_OPT_KEEP, "yes");
1109 set_option(transport, TRANS_OPT_DEPTH, depth);
1110 if (deepen && deepen_since)
1111 set_option(transport, TRANS_OPT_DEEPEN_SINCE, deepen_since);
1112 if (deepen && deepen_not.nr)
1113 set_option(transport, TRANS_OPT_DEEPEN_NOT,
1114 (const char *)&deepen_not);
1115 if (deepen_relative)
1116 set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, "yes");
1118 set_option(transport, TRANS_OPT_UPDATE_SHALLOW, "yes");
1119 if (filter_options.choice) {
1120 set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER,
1121 filter_options.filter_spec);
1122 set_option(transport, TRANS_OPT_FROM_PROMISOR, "1");
1124 if (negotiation_tip.nr) {
1125 if (transport->smart_options)
1126 add_negotiation_tips(transport->smart_options);
1128 warning("Ignoring --negotiation-tip because the protocol does not support it.");
1133 static void backfill_tags(struct transport *transport, struct ref *ref_map)
1138 * Once we have set TRANS_OPT_DEEPEN_SINCE, we can't unset it
1139 * when remote helper is used (setting it to an empty string
1140 * is not unsetting). We could extend the remote helper
1141 * protocol for that, but for now, just force a new connection
1142 * without deepen-since. Similar story for deepen-not.
1144 cannot_reuse = transport->cannot_reuse ||
1145 deepen_since || deepen_not.nr;
1147 gsecondary = prepare_transport(transport->remote, 0);
1148 transport = gsecondary;
1151 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
1152 transport_set_option(transport, TRANS_OPT_DEPTH, "0");
1153 transport_set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, NULL);
1154 if (!fetch_refs(transport, ref_map))
1155 consume_refs(transport, ref_map);
1158 transport_disconnect(gsecondary);
1163 static int do_fetch(struct transport *transport,
1166 struct ref *ref_map;
1167 int autotags = (transport->remote->fetch_tags == 1);
1169 const struct ref *remote_refs;
1170 struct argv_array ref_prefixes = ARGV_ARRAY_INIT;
1172 if (tags == TAGS_DEFAULT) {
1173 if (transport->remote->fetch_tags == 2)
1175 if (transport->remote->fetch_tags == -1)
1179 /* if not appending, truncate FETCH_HEAD */
1180 if (!append && !dry_run) {
1181 retcode = truncate_fetch_head();
1187 refspec_ref_prefixes(rs, &ref_prefixes);
1188 else if (transport->remote && transport->remote->fetch.nr)
1189 refspec_ref_prefixes(&transport->remote->fetch, &ref_prefixes);
1191 if (ref_prefixes.argc &&
1192 (tags == TAGS_SET || (tags == TAGS_DEFAULT))) {
1193 argv_array_push(&ref_prefixes, "refs/tags/");
1196 remote_refs = transport_get_remote_refs(transport, &ref_prefixes);
1197 argv_array_clear(&ref_prefixes);
1199 ref_map = get_ref_map(transport->remote, remote_refs, rs,
1201 if (!update_head_ok)
1202 check_not_current_branch(ref_map);
1204 if (tags == TAGS_DEFAULT && autotags)
1205 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
1208 * We only prune based on refspecs specified
1209 * explicitly (via command line or configuration); we
1210 * don't care whether --tags was specified.
1213 prune_refs(rs, ref_map, transport->url);
1215 prune_refs(&transport->remote->fetch,
1220 if (fetch_refs(transport, ref_map) || consume_refs(transport, ref_map)) {
1227 /* if neither --no-tags nor --tags was specified, do automated tag
1229 if (tags == TAGS_DEFAULT && autotags) {
1230 struct ref **tail = &ref_map;
1232 find_non_local_tags(remote_refs, &ref_map, &tail);
1234 backfill_tags(transport, ref_map);
1242 static int get_one_remote_for_fetch(struct remote *remote, void *priv)
1244 struct string_list *list = priv;
1245 if (!remote->skip_default_update)
1246 string_list_append(list, remote->name);
1250 struct remote_group_data {
1252 struct string_list *list;
1255 static int get_remote_group(const char *key, const char *value, void *priv)
1257 struct remote_group_data *g = priv;
1259 if (skip_prefix(key, "remotes.", &key) && !strcmp(key, g->name)) {
1260 /* split list by white space */
1262 size_t wordlen = strcspn(value, " \t\n");
1265 string_list_append_nodup(g->list,
1266 xstrndup(value, wordlen));
1267 value += wordlen + (value[wordlen] != '\0');
1274 static int add_remote_or_group(const char *name, struct string_list *list)
1276 int prev_nr = list->nr;
1277 struct remote_group_data g;
1278 g.name = name; g.list = list;
1280 git_config(get_remote_group, &g);
1281 if (list->nr == prev_nr) {
1282 struct remote *remote = remote_get(name);
1283 if (!remote_is_configured(remote, 0))
1285 string_list_append(list, remote->name);
1290 static void add_options_to_argv(struct argv_array *argv)
1293 argv_array_push(argv, "--dry-run");
1295 argv_array_push(argv, prune ? "--prune" : "--no-prune");
1296 if (prune_tags != -1)
1297 argv_array_push(argv, prune_tags ? "--prune-tags" : "--no-prune-tags");
1299 argv_array_push(argv, "--update-head-ok");
1301 argv_array_push(argv, "--force");
1303 argv_array_push(argv, "--keep");
1304 if (recurse_submodules == RECURSE_SUBMODULES_ON)
1305 argv_array_push(argv, "--recurse-submodules");
1306 else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND)
1307 argv_array_push(argv, "--recurse-submodules=on-demand");
1308 if (tags == TAGS_SET)
1309 argv_array_push(argv, "--tags");
1310 else if (tags == TAGS_UNSET)
1311 argv_array_push(argv, "--no-tags");
1313 argv_array_push(argv, "-v");
1315 argv_array_push(argv, "-v");
1316 else if (verbosity < 0)
1317 argv_array_push(argv, "-q");
1321 static int fetch_multiple(struct string_list *list)
1324 struct argv_array argv = ARGV_ARRAY_INIT;
1326 if (!append && !dry_run) {
1327 int errcode = truncate_fetch_head();
1332 argv_array_pushl(&argv, "fetch", "--append", NULL);
1333 add_options_to_argv(&argv);
1335 for (i = 0; i < list->nr; i++) {
1336 const char *name = list->items[i].string;
1337 argv_array_push(&argv, name);
1339 printf(_("Fetching %s\n"), name);
1340 if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
1341 error(_("Could not fetch %s"), name);
1344 argv_array_pop(&argv);
1347 argv_array_clear(&argv);
1352 * Fetching from the promisor remote should use the given filter-spec
1353 * or inherit the default filter-spec from the config.
1355 static inline void fetch_one_setup_partial(struct remote *remote)
1358 * Explicit --no-filter argument overrides everything, regardless
1359 * of any prior partial clones and fetches.
1361 if (filter_options.no_filter)
1365 * If no prior partial clone/fetch and the current fetch DID NOT
1366 * request a partial-fetch, do a normal fetch.
1368 if (!repository_format_partial_clone && !filter_options.choice)
1372 * If this is the FIRST partial-fetch request, we enable partial
1373 * on this repo and remember the given filter-spec as the default
1374 * for subsequent fetches to this remote.
1376 if (!repository_format_partial_clone && filter_options.choice) {
1377 partial_clone_register(remote->name, &filter_options);
1382 * We are currently limited to only ONE promisor remote and only
1383 * allow partial-fetches from the promisor remote.
1385 if (strcmp(remote->name, repository_format_partial_clone)) {
1386 if (filter_options.choice)
1387 die(_("--filter can only be used with the remote configured in core.partialClone"));
1392 * Do a partial-fetch from the promisor remote using either the
1393 * explicitly given filter-spec or inherit the filter-spec from
1396 if (!filter_options.choice)
1397 partial_clone_get_default_filter_spec(&filter_options);
1401 static int fetch_one(struct remote *remote, int argc, const char **argv, int prune_tags_ok)
1403 struct refspec rs = REFSPEC_INIT_FETCH;
1406 int maybe_prune_tags;
1407 int remote_via_config = remote_is_configured(remote, 0);
1410 die(_("No remote repository specified. Please, specify either a URL or a\n"
1411 "remote name from which new revisions should be fetched."));
1413 gtransport = prepare_transport(remote, 1);
1416 /* no command line request */
1417 if (0 <= remote->prune)
1418 prune = remote->prune;
1419 else if (0 <= fetch_prune_config)
1420 prune = fetch_prune_config;
1422 prune = PRUNE_BY_DEFAULT;
1425 if (prune_tags < 0) {
1426 /* no command line request */
1427 if (0 <= remote->prune_tags)
1428 prune_tags = remote->prune_tags;
1429 else if (0 <= fetch_prune_tags_config)
1430 prune_tags = fetch_prune_tags_config;
1432 prune_tags = PRUNE_TAGS_BY_DEFAULT;
1435 maybe_prune_tags = prune_tags_ok && prune_tags;
1436 if (maybe_prune_tags && remote_via_config)
1437 refspec_append(&remote->fetch, TAG_REFSPEC);
1439 if (maybe_prune_tags && (argc || !remote_via_config))
1440 refspec_append(&rs, TAG_REFSPEC);
1442 for (i = 0; i < argc; i++) {
1443 if (!strcmp(argv[i], "tag")) {
1447 die(_("You need to specify a tag name."));
1449 tag = xstrfmt("refs/tags/%s:refs/tags/%s",
1451 refspec_append(&rs, tag);
1454 refspec_append(&rs, argv[i]);
1458 if (server_options.nr)
1459 gtransport->server_options = &server_options;
1461 sigchain_push_common(unlock_pack_on_signal);
1462 atexit(unlock_pack);
1463 exit_code = do_fetch(gtransport, &rs);
1465 transport_disconnect(gtransport);
1470 int cmd_fetch(int argc, const char **argv, const char *prefix)
1473 struct string_list list = STRING_LIST_INIT_DUP;
1474 struct remote *remote = NULL;
1476 int prune_tags_ok = 1;
1477 struct argv_array argv_gc_auto = ARGV_ARRAY_INIT;
1479 packet_trace_identity("fetch");
1481 fetch_if_missing = 0;
1483 /* Record the command line for the reflog */
1484 strbuf_addstr(&default_rla, "fetch");
1485 for (i = 1; i < argc; i++)
1486 strbuf_addf(&default_rla, " %s", argv[i]);
1488 fetch_config_from_gitmodules(&max_children, &recurse_submodules);
1489 git_config(git_fetch_config, NULL);
1491 argc = parse_options(argc, argv, prefix,
1492 builtin_fetch_options, builtin_fetch_usage, 0);
1494 if (deepen_relative) {
1495 if (deepen_relative < 0)
1496 die(_("Negative depth in --deepen is not supported"));
1498 die(_("--deepen and --depth are mutually exclusive"));
1499 depth = xstrfmt("%d", deepen_relative);
1503 die(_("--depth and --unshallow cannot be used together"));
1504 else if (!is_repository_shallow(the_repository))
1505 die(_("--unshallow on a complete repository does not make sense"));
1507 depth = xstrfmt("%d", INFINITE_DEPTH);
1510 /* no need to be strict, transport_set_option() will validate it again */
1511 if (depth && atoi(depth) < 1)
1512 die(_("depth %s is not a positive number"), depth);
1513 if (depth || deepen_since || deepen_not.nr)
1516 if (filter_options.choice && !repository_format_partial_clone)
1517 die("--filter can only be used when extensions.partialClone is set");
1521 die(_("fetch --all does not take a repository argument"));
1523 die(_("fetch --all does not make sense with refspecs"));
1524 (void) for_each_remote(get_one_remote_for_fetch, &list);
1525 } else if (argc == 0) {
1526 /* No arguments -- use default remote */
1527 remote = remote_get(NULL);
1528 } else if (multiple) {
1529 /* All arguments are assumed to be remotes or groups */
1530 for (i = 0; i < argc; i++)
1531 if (!add_remote_or_group(argv[i], &list))
1532 die(_("No such remote or remote group: %s"), argv[i]);
1534 /* Single remote or group */
1535 (void) add_remote_or_group(argv[0], &list);
1537 /* More than one remote */
1539 die(_("Fetching a group and specifying refspecs does not make sense"));
1541 /* Zero or one remotes */
1542 remote = remote_get(argv[0]);
1543 prune_tags_ok = (argc == 1);
1550 if (filter_options.choice || repository_format_partial_clone)
1551 fetch_one_setup_partial(remote);
1552 result = fetch_one(remote, argc, argv, prune_tags_ok);
1554 if (filter_options.choice)
1555 die(_("--filter can only be used with the remote configured in core.partialClone"));
1556 /* TODO should this also die if we have a previous partial-clone? */
1557 result = fetch_multiple(&list);
1560 if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
1561 struct argv_array options = ARGV_ARRAY_INIT;
1563 add_options_to_argv(&options);
1564 result = fetch_populated_submodules(the_repository,
1568 recurse_submodules_default,
1571 argv_array_clear(&options);
1574 string_list_clear(&list, 0);
1576 close_all_packs(the_repository->objects);
1578 argv_array_pushl(&argv_gc_auto, "gc", "--auto", NULL);
1580 argv_array_push(&argv_gc_auto, "--quiet");
1581 run_command_v_opt(argv_gc_auto.argv, RUN_GIT_CMD);
1582 argv_array_clear(&argv_gc_auto);