6 #include "repository.h"
10 #include "string-list.h"
12 #include "transport.h"
13 #include "run-command.h"
14 #include "parse-options.h"
16 #include "submodule-config.h"
17 #include "submodule.h"
18 #include "connected.h"
19 #include "argv-array.h"
22 #include "list-objects-filter-options.h"
24 static const char * const builtin_fetch_usage[] = {
25 N_("git fetch [<options>] [<repository> [<refspec>...]]"),
26 N_("git fetch [<options>] <group>"),
27 N_("git fetch --multiple [<options>] [(<repository> | <group>)...]"),
28 N_("git fetch --all [<options>]"),
38 static int fetch_prune_config = -1; /* unspecified */
39 static int prune = -1; /* unspecified */
40 #define PRUNE_BY_DEFAULT 0 /* do we prune by default? */
42 static int fetch_prune_tags_config = -1; /* unspecified */
43 static int prune_tags = -1; /* unspecified */
44 #define PRUNE_TAGS_BY_DEFAULT 0 /* do we prune tags by default? */
46 static int all, append, dry_run, force, keep, multiple, update_head_ok, verbosity, deepen_relative;
47 static int progress = -1;
48 static int tags = TAGS_DEFAULT, unshallow, update_shallow, deepen;
49 static int max_children = 1;
50 static enum transport_family family;
51 static const char *depth;
52 static const char *deepen_since;
53 static const char *upload_pack;
54 static struct string_list deepen_not = STRING_LIST_INIT_NODUP;
55 static struct strbuf default_rla = STRBUF_INIT;
56 static struct transport *gtransport;
57 static struct transport *gsecondary;
58 static const char *submodule_prefix = "";
59 static int recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
60 static int recurse_submodules_default = RECURSE_SUBMODULES_ON_DEMAND;
61 static int shown_url = 0;
62 static int refmap_alloc, refmap_nr;
63 static const char **refmap_array;
64 static struct list_objects_filter_options filter_options;
66 static int git_fetch_config(const char *k, const char *v, void *cb)
68 if (!strcmp(k, "fetch.prune")) {
69 fetch_prune_config = git_config_bool(k, v);
73 if (!strcmp(k, "fetch.prunetags")) {
74 fetch_prune_tags_config = git_config_bool(k, v);
78 if (!strcmp(k, "submodule.recurse")) {
79 int r = git_config_bool(k, v) ?
80 RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;
81 recurse_submodules = r;
84 if (!strcmp(k, "submodule.fetchjobs")) {
85 max_children = parse_submodule_fetchjobs(k, v);
87 } else if (!strcmp(k, "fetch.recursesubmodules")) {
88 recurse_submodules = parse_fetch_recurse_submodules_arg(k, v);
92 return git_default_config(k, v, cb);
95 static int gitmodules_fetch_config(const char *var, const char *value, void *cb)
97 if (!strcmp(var, "submodule.fetchjobs")) {
98 max_children = parse_submodule_fetchjobs(var, value);
100 } else if (!strcmp(var, "fetch.recursesubmodules")) {
101 recurse_submodules = parse_fetch_recurse_submodules_arg(var, value);
108 static int parse_refmap_arg(const struct option *opt, const char *arg, int unset)
110 ALLOC_GROW(refmap_array, refmap_nr + 1, refmap_alloc);
113 * "git fetch --refmap='' origin foo"
114 * can be used to tell the command not to store anywhere
117 refmap_array[refmap_nr++] = arg;
121 static struct option builtin_fetch_options[] = {
122 OPT__VERBOSITY(&verbosity),
123 OPT_BOOL(0, "all", &all,
124 N_("fetch from all remotes")),
125 OPT_BOOL('a', "append", &append,
126 N_("append to .git/FETCH_HEAD instead of overwriting")),
127 OPT_STRING(0, "upload-pack", &upload_pack, N_("path"),
128 N_("path to upload pack on remote end")),
129 OPT__FORCE(&force, N_("force overwrite of local branch"), 0),
130 OPT_BOOL('m', "multiple", &multiple,
131 N_("fetch from multiple remotes")),
132 OPT_SET_INT('t', "tags", &tags,
133 N_("fetch all tags and associated objects"), TAGS_SET),
134 OPT_SET_INT('n', NULL, &tags,
135 N_("do not fetch all tags (--no-tags)"), TAGS_UNSET),
136 OPT_INTEGER('j', "jobs", &max_children,
137 N_("number of submodules fetched in parallel")),
138 OPT_BOOL('p', "prune", &prune,
139 N_("prune remote-tracking branches no longer on remote")),
140 OPT_BOOL('P', "prune-tags", &prune_tags,
141 N_("prune local tags no longer on remote and clobber changed tags")),
142 { OPTION_CALLBACK, 0, "recurse-submodules", &recurse_submodules, N_("on-demand"),
143 N_("control recursive fetching of submodules"),
144 PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules },
145 OPT_BOOL(0, "dry-run", &dry_run,
147 OPT_BOOL('k', "keep", &keep, N_("keep downloaded pack")),
148 OPT_BOOL('u', "update-head-ok", &update_head_ok,
149 N_("allow updating of HEAD ref")),
150 OPT_BOOL(0, "progress", &progress, N_("force progress reporting")),
151 OPT_STRING(0, "depth", &depth, N_("depth"),
152 N_("deepen history of shallow clone")),
153 OPT_STRING(0, "shallow-since", &deepen_since, N_("time"),
154 N_("deepen history of shallow repository based on time")),
155 OPT_STRING_LIST(0, "shallow-exclude", &deepen_not, N_("revision"),
156 N_("deepen history of shallow clone, excluding rev")),
157 OPT_INTEGER(0, "deepen", &deepen_relative,
158 N_("deepen history of shallow clone")),
159 { OPTION_SET_INT, 0, "unshallow", &unshallow, NULL,
160 N_("convert to a complete repository"),
161 PARSE_OPT_NONEG | PARSE_OPT_NOARG, NULL, 1 },
162 { OPTION_STRING, 0, "submodule-prefix", &submodule_prefix, N_("dir"),
163 N_("prepend this to submodule path output"), PARSE_OPT_HIDDEN },
164 { OPTION_CALLBACK, 0, "recurse-submodules-default",
165 &recurse_submodules_default, N_("on-demand"),
166 N_("default for recursive fetching of submodules "
167 "(lower priority than config files)"),
168 PARSE_OPT_HIDDEN, option_fetch_parse_recurse_submodules },
169 OPT_BOOL(0, "update-shallow", &update_shallow,
170 N_("accept refs that update .git/shallow")),
171 { OPTION_CALLBACK, 0, "refmap", NULL, N_("refmap"),
172 N_("specify fetch refmap"), PARSE_OPT_NONEG, parse_refmap_arg },
173 OPT_SET_INT('4', "ipv4", &family, N_("use IPv4 addresses only"),
174 TRANSPORT_FAMILY_IPV4),
175 OPT_SET_INT('6', "ipv6", &family, N_("use IPv6 addresses only"),
176 TRANSPORT_FAMILY_IPV6),
177 OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options),
181 static void unlock_pack(void)
184 transport_unlock_pack(gtransport);
186 transport_unlock_pack(gsecondary);
189 static void unlock_pack_on_signal(int signo)
196 static void add_merge_config(struct ref **head,
197 const struct ref *remote_refs,
198 struct branch *branch,
203 for (i = 0; i < branch->merge_nr; i++) {
204 struct ref *rm, **old_tail = *tail;
205 struct refspec refspec;
207 for (rm = *head; rm; rm = rm->next) {
208 if (branch_merge_matches(branch, i, rm->name)) {
209 rm->fetch_head_status = FETCH_HEAD_MERGE;
217 * Not fetched to a remote-tracking branch? We need to fetch
218 * it anyway to allow this branch's "branch.$name.merge"
219 * to be honored by 'git pull', but we do not have to
220 * fail if branch.$name.merge is misconfigured to point
221 * at a nonexisting branch. If we were indeed called by
222 * 'git pull', it will notice the misconfiguration because
223 * there is no entry in the resulting FETCH_HEAD marked
226 memset(&refspec, 0, sizeof(refspec));
227 refspec.src = branch->merge[i]->src;
228 get_fetch_map(remote_refs, &refspec, tail, 1);
229 for (rm = *old_tail; rm; rm = rm->next)
230 rm->fetch_head_status = FETCH_HEAD_MERGE;
234 static int add_existing(const char *refname, const struct object_id *oid,
235 int flag, void *cbdata)
237 struct string_list *list = (struct string_list *)cbdata;
238 struct string_list_item *item = string_list_insert(list, refname);
239 struct object_id *old_oid = xmalloc(sizeof(*old_oid));
241 oidcpy(old_oid, oid);
242 item->util = old_oid;
246 static int will_fetch(struct ref **head, const unsigned char *sha1)
248 struct ref *rm = *head;
250 if (!hashcmp(rm->old_oid.hash, sha1))
257 static void find_non_local_tags(struct transport *transport,
261 struct string_list existing_refs = STRING_LIST_INIT_DUP;
262 struct string_list remote_refs = STRING_LIST_INIT_NODUP;
263 const struct ref *ref;
264 struct string_list_item *item = NULL;
266 for_each_ref(add_existing, &existing_refs);
267 for (ref = transport_get_remote_refs(transport, NULL); ref; ref = ref->next) {
268 if (!starts_with(ref->name, "refs/tags/"))
272 * The peeled ref always follows the matching base
273 * ref, so if we see a peeled ref that we don't want
274 * to fetch then we can mark the ref entry in the list
275 * as one to ignore by setting util to NULL.
277 if (ends_with(ref->name, "^{}")) {
279 !has_object_file_with_flags(&ref->old_oid,
280 OBJECT_INFO_QUICK) &&
281 !will_fetch(head, ref->old_oid.hash) &&
282 !has_sha1_file_with_flags(item->util,
283 OBJECT_INFO_QUICK) &&
284 !will_fetch(head, item->util))
291 * If item is non-NULL here, then we previously saw a
292 * ref not followed by a peeled reference, so we need
293 * to check if it is a lightweight tag that we want to
297 !has_sha1_file_with_flags(item->util, OBJECT_INFO_QUICK) &&
298 !will_fetch(head, item->util))
303 /* skip duplicates and refs that we already have */
304 if (string_list_has_string(&remote_refs, ref->name) ||
305 string_list_has_string(&existing_refs, ref->name))
308 item = string_list_insert(&remote_refs, ref->name);
309 item->util = (void *)&ref->old_oid;
311 string_list_clear(&existing_refs, 1);
314 * We may have a final lightweight tag that needs to be
315 * checked to see if it needs fetching.
318 !has_sha1_file_with_flags(item->util, OBJECT_INFO_QUICK) &&
319 !will_fetch(head, item->util))
323 * For all the tags in the remote_refs string list,
324 * add them to the list of refs to be fetched
326 for_each_string_list_item(item, &remote_refs) {
327 /* Unless we have already decided to ignore this item... */
330 struct ref *rm = alloc_ref(item->string);
331 rm->peer_ref = alloc_ref(item->string);
332 oidcpy(&rm->old_oid, item->util);
338 string_list_clear(&remote_refs, 0);
341 static struct ref *get_ref_map(struct transport *transport,
342 struct refspec *refspecs, int refspec_count,
343 int tags, int *autotags)
347 struct ref *ref_map = NULL;
348 struct ref **tail = &ref_map;
349 struct argv_array ref_patterns = ARGV_ARRAY_INIT;
351 /* opportunistically-updated references: */
352 struct ref *orefs = NULL, **oref_tail = &orefs;
354 const struct ref *remote_refs;
356 for (i = 0; i < refspec_count; i++) {
357 if (!refspecs[i].exact_sha1)
358 argv_array_push(&ref_patterns, refspecs[i].src);
361 remote_refs = transport_get_remote_refs(transport, &ref_patterns);
363 argv_array_clear(&ref_patterns);
366 struct refspec *fetch_refspec;
367 int fetch_refspec_nr;
369 for (i = 0; i < refspec_count; i++) {
370 get_fetch_map(remote_refs, &refspecs[i], &tail, 0);
371 if (refspecs[i].dst && refspecs[i].dst[0])
374 /* Merge everything on the command line (but not --tags) */
375 for (rm = ref_map; rm; rm = rm->next)
376 rm->fetch_head_status = FETCH_HEAD_MERGE;
379 * For any refs that we happen to be fetching via
380 * command-line arguments, the destination ref might
381 * have been missing or have been different than the
382 * remote-tracking ref that would be derived from the
383 * configured refspec. In these cases, we want to
384 * take the opportunity to update their configured
385 * remote-tracking reference. However, we do not want
386 * to mention these entries in FETCH_HEAD at all, as
387 * they would simply be duplicates of existing
388 * entries, so we set them FETCH_HEAD_IGNORE below.
390 * We compute these entries now, based only on the
391 * refspecs specified on the command line. But we add
392 * them to the list following the refspecs resulting
393 * from the tags option so that one of the latter,
394 * which has FETCH_HEAD_NOT_FOR_MERGE, is not removed
395 * by ref_remove_duplicates() in favor of one of these
396 * opportunistic entries with FETCH_HEAD_IGNORE.
399 fetch_refspec = parse_fetch_refspec(refmap_nr, refmap_array);
400 fetch_refspec_nr = refmap_nr;
402 fetch_refspec = transport->remote->fetch;
403 fetch_refspec_nr = transport->remote->fetch_refspec_nr;
406 for (i = 0; i < fetch_refspec_nr; i++)
407 get_fetch_map(ref_map, &fetch_refspec[i], &oref_tail, 1);
408 } else if (refmap_array) {
409 die("--refmap option is only meaningful with command-line refspec(s).");
411 /* Use the defaults */
412 struct remote *remote = transport->remote;
413 struct branch *branch = branch_get(NULL);
414 int has_merge = branch_has_merge_config(branch);
416 (remote->fetch_refspec_nr ||
417 /* Note: has_merge implies non-NULL branch->remote_name */
418 (has_merge && !strcmp(branch->remote_name, remote->name)))) {
419 for (i = 0; i < remote->fetch_refspec_nr; i++) {
420 get_fetch_map(remote_refs, &remote->fetch[i], &tail, 0);
421 if (remote->fetch[i].dst &&
422 remote->fetch[i].dst[0])
424 if (!i && !has_merge && ref_map &&
425 !remote->fetch[0].pattern)
426 ref_map->fetch_head_status = FETCH_HEAD_MERGE;
429 * if the remote we're fetching from is the same
430 * as given in branch.<name>.remote, we add the
431 * ref given in branch.<name>.merge, too.
433 * Note: has_merge implies non-NULL branch->remote_name
436 !strcmp(branch->remote_name, remote->name))
437 add_merge_config(&ref_map, remote_refs, branch, &tail);
439 ref_map = get_remote_ref(remote_refs, "HEAD");
441 die(_("Couldn't find remote ref HEAD"));
442 ref_map->fetch_head_status = FETCH_HEAD_MERGE;
443 tail = &ref_map->next;
447 if (tags == TAGS_SET)
448 /* also fetch all tags */
449 get_fetch_map(remote_refs, tag_refspec, &tail, 0);
450 else if (tags == TAGS_DEFAULT && *autotags)
451 find_non_local_tags(transport, &ref_map, &tail);
453 /* Now append any refs to be updated opportunistically: */
455 for (rm = orefs; rm; rm = rm->next) {
456 rm->fetch_head_status = FETCH_HEAD_IGNORE;
460 return ref_remove_duplicates(ref_map);
463 #define STORE_REF_ERROR_OTHER 1
464 #define STORE_REF_ERROR_DF_CONFLICT 2
466 static int s_update_ref(const char *action,
471 char *rla = getenv("GIT_REFLOG_ACTION");
472 struct ref_transaction *transaction;
473 struct strbuf err = STRBUF_INIT;
474 int ret, df_conflict = 0;
479 rla = default_rla.buf;
480 msg = xstrfmt("%s: %s", rla, action);
482 transaction = ref_transaction_begin(&err);
484 ref_transaction_update(transaction, ref->name,
486 check_old ? &ref->old_oid : NULL,
490 ret = ref_transaction_commit(transaction, &err);
492 df_conflict = (ret == TRANSACTION_NAME_CONFLICT);
496 ref_transaction_free(transaction);
497 strbuf_release(&err);
501 ref_transaction_free(transaction);
502 error("%s", err.buf);
503 strbuf_release(&err);
505 return df_conflict ? STORE_REF_ERROR_DF_CONFLICT
506 : STORE_REF_ERROR_OTHER;
509 static int refcol_width = 10;
510 static int compact_format;
512 static void adjust_refcol_width(const struct ref *ref)
514 int max, rlen, llen, len;
516 /* uptodate lines are only shown on high verbosity level */
517 if (!verbosity && !oidcmp(&ref->peer_ref->old_oid, &ref->old_oid))
520 max = term_columns();
521 rlen = utf8_strwidth(prettify_refname(ref->name));
523 llen = utf8_strwidth(prettify_refname(ref->peer_ref->name));
526 * rough estimation to see if the output line is too long and
527 * should not be counted (we can't do precise calculation
528 * anyway because we don't know if the error explanation part
529 * will be printed in update_local_ref)
531 if (compact_format) {
535 len = 21 /* flag and summary */ + rlen + 4 /* -> */ + llen;
540 * Not precise calculation for compact mode because '*' can
541 * appear on the left hand side of '->' and shrink the column
544 if (refcol_width < rlen)
548 static void prepare_format_display(struct ref *ref_map)
551 const char *format = "full";
553 git_config_get_string_const("fetch.output", &format);
554 if (!strcasecmp(format, "full"))
556 else if (!strcasecmp(format, "compact"))
559 die(_("configuration fetch.output contains invalid value %s"),
562 for (rm = ref_map; rm; rm = rm->next) {
563 if (rm->status == REF_STATUS_REJECT_SHALLOW ||
565 !strcmp(rm->name, "HEAD"))
568 adjust_refcol_width(rm);
572 static void print_remote_to_local(struct strbuf *display,
573 const char *remote, const char *local)
575 strbuf_addf(display, "%-*s -> %s", refcol_width, remote, local);
578 static int find_and_replace(struct strbuf *haystack,
580 const char *placeholder)
582 const char *p = strstr(haystack->buf, needle);
588 if (p > haystack->buf && p[-1] != '/')
592 nlen = strlen(needle);
593 if (plen > nlen && p[nlen] != '/')
596 strbuf_splice(haystack, p - haystack->buf, nlen,
597 placeholder, strlen(placeholder));
601 static void print_compact(struct strbuf *display,
602 const char *remote, const char *local)
604 struct strbuf r = STRBUF_INIT;
605 struct strbuf l = STRBUF_INIT;
607 if (!strcmp(remote, local)) {
608 strbuf_addf(display, "%-*s -> *", refcol_width, remote);
612 strbuf_addstr(&r, remote);
613 strbuf_addstr(&l, local);
615 if (!find_and_replace(&r, local, "*"))
616 find_and_replace(&l, remote, "*");
617 print_remote_to_local(display, r.buf, l.buf);
623 static void format_display(struct strbuf *display, char code,
624 const char *summary, const char *error,
625 const char *remote, const char *local,
628 int width = (summary_width + strlen(summary) - gettext_width(summary));
630 strbuf_addf(display, "%c %-*s ", code, width, summary);
632 print_remote_to_local(display, remote, local);
634 print_compact(display, remote, local);
636 strbuf_addf(display, " (%s)", error);
639 static int update_local_ref(struct ref *ref,
641 const struct ref *remote_ref,
642 struct strbuf *display,
645 struct commit *current = NULL, *updated;
646 enum object_type type;
647 struct branch *current_branch = branch_get(NULL);
648 const char *pretty_ref = prettify_refname(ref->name);
650 type = sha1_object_info(ref->new_oid.hash, NULL);
652 die(_("object %s not found"), oid_to_hex(&ref->new_oid));
654 if (!oidcmp(&ref->old_oid, &ref->new_oid)) {
656 format_display(display, '=', _("[up to date]"), NULL,
657 remote, pretty_ref, summary_width);
661 if (current_branch &&
662 !strcmp(ref->name, current_branch->name) &&
663 !(update_head_ok || is_bare_repository()) &&
664 !is_null_oid(&ref->old_oid)) {
666 * If this is the head, and it's not okay to update
667 * the head, and the old value of the head isn't empty...
669 format_display(display, '!', _("[rejected]"),
670 _("can't fetch in current branch"),
671 remote, pretty_ref, summary_width);
675 if (!is_null_oid(&ref->old_oid) &&
676 starts_with(ref->name, "refs/tags/")) {
678 r = s_update_ref("updating tag", ref, 0);
679 format_display(display, r ? '!' : 't', _("[tag update]"),
680 r ? _("unable to update local ref") : NULL,
681 remote, pretty_ref, summary_width);
685 current = lookup_commit_reference_gently(&ref->old_oid, 1);
686 updated = lookup_commit_reference_gently(&ref->new_oid, 1);
687 if (!current || !updated) {
692 * Nicely describe the new ref we're fetching.
693 * Base this on the remote's ref name, as it's
694 * more likely to follow a standard layout.
696 const char *name = remote_ref ? remote_ref->name : "";
697 if (starts_with(name, "refs/tags/")) {
699 what = _("[new tag]");
700 } else if (starts_with(name, "refs/heads/")) {
701 msg = "storing head";
702 what = _("[new branch]");
705 what = _("[new ref]");
708 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
709 (recurse_submodules != RECURSE_SUBMODULES_ON))
710 check_for_new_submodule_commits(&ref->new_oid);
711 r = s_update_ref(msg, ref, 0);
712 format_display(display, r ? '!' : '*', what,
713 r ? _("unable to update local ref") : NULL,
714 remote, pretty_ref, summary_width);
718 if (in_merge_bases(current, updated)) {
719 struct strbuf quickref = STRBUF_INIT;
721 strbuf_add_unique_abbrev(&quickref, current->object.oid.hash, DEFAULT_ABBREV);
722 strbuf_addstr(&quickref, "..");
723 strbuf_add_unique_abbrev(&quickref, ref->new_oid.hash, DEFAULT_ABBREV);
724 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
725 (recurse_submodules != RECURSE_SUBMODULES_ON))
726 check_for_new_submodule_commits(&ref->new_oid);
727 r = s_update_ref("fast-forward", ref, 1);
728 format_display(display, r ? '!' : ' ', quickref.buf,
729 r ? _("unable to update local ref") : NULL,
730 remote, pretty_ref, summary_width);
731 strbuf_release(&quickref);
733 } else if (force || ref->force) {
734 struct strbuf quickref = STRBUF_INIT;
736 strbuf_add_unique_abbrev(&quickref, current->object.oid.hash, DEFAULT_ABBREV);
737 strbuf_addstr(&quickref, "...");
738 strbuf_add_unique_abbrev(&quickref, ref->new_oid.hash, DEFAULT_ABBREV);
739 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
740 (recurse_submodules != RECURSE_SUBMODULES_ON))
741 check_for_new_submodule_commits(&ref->new_oid);
742 r = s_update_ref("forced-update", ref, 1);
743 format_display(display, r ? '!' : '+', quickref.buf,
744 r ? _("unable to update local ref") : _("forced update"),
745 remote, pretty_ref, summary_width);
746 strbuf_release(&quickref);
749 format_display(display, '!', _("[rejected]"), _("non-fast-forward"),
750 remote, pretty_ref, summary_width);
755 static int iterate_ref_map(void *cb_data, struct object_id *oid)
757 struct ref **rm = cb_data;
758 struct ref *ref = *rm;
760 while (ref && ref->status == REF_STATUS_REJECT_SHALLOW)
763 return -1; /* end of the list */
765 oidcpy(oid, &ref->old_oid);
769 static int store_updated_refs(const char *raw_url, const char *remote_name,
773 struct commit *commit;
774 int url_len, i, rc = 0;
775 struct strbuf note = STRBUF_INIT;
776 const char *what, *kind;
779 const char *filename = dry_run ? "/dev/null" : git_path_fetch_head();
781 int summary_width = transport_summary_width(ref_map);
783 fp = fopen(filename, "a");
785 return error_errno(_("cannot open %s"), filename);
788 url = transport_anonymize_url(raw_url);
790 url = xstrdup("foreign");
793 if (check_connected(iterate_ref_map, &rm, NULL)) {
794 rc = error(_("%s did not send all necessary objects\n"), url);
798 prepare_format_display(ref_map);
801 * We do a pass for each fetch_head_status type in their enum order, so
802 * merged entries are written before not-for-merge. That lets readers
803 * use FETCH_HEAD as a refname to refer to the ref to be merged.
805 for (want_status = FETCH_HEAD_MERGE;
806 want_status <= FETCH_HEAD_IGNORE;
808 for (rm = ref_map; rm; rm = rm->next) {
809 struct ref *ref = NULL;
810 const char *merge_status_marker = "";
812 if (rm->status == REF_STATUS_REJECT_SHALLOW) {
813 if (want_status == FETCH_HEAD_MERGE)
814 warning(_("reject %s because shallow roots are not allowed to be updated"),
815 rm->peer_ref ? rm->peer_ref->name : rm->name);
819 commit = lookup_commit_reference_gently(&rm->old_oid,
822 rm->fetch_head_status = FETCH_HEAD_NOT_FOR_MERGE;
824 if (rm->fetch_head_status != want_status)
828 ref = alloc_ref(rm->peer_ref->name);
829 oidcpy(&ref->old_oid, &rm->peer_ref->old_oid);
830 oidcpy(&ref->new_oid, &rm->old_oid);
831 ref->force = rm->peer_ref->force;
835 if (!strcmp(rm->name, "HEAD")) {
839 else if (starts_with(rm->name, "refs/heads/")) {
841 what = rm->name + 11;
843 else if (starts_with(rm->name, "refs/tags/")) {
845 what = rm->name + 10;
847 else if (starts_with(rm->name, "refs/remotes/")) {
848 kind = "remote-tracking branch";
849 what = rm->name + 13;
856 url_len = strlen(url);
857 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
860 if (4 < i && !strncmp(".git", url + i - 3, 4))
866 strbuf_addf(¬e, "%s ", kind);
867 strbuf_addf(¬e, "'%s' of ", what);
869 switch (rm->fetch_head_status) {
870 case FETCH_HEAD_NOT_FOR_MERGE:
871 merge_status_marker = "not-for-merge";
873 case FETCH_HEAD_MERGE:
874 fprintf(fp, "%s\t%s\t%s",
875 oid_to_hex(&rm->old_oid),
878 for (i = 0; i < url_len; ++i)
886 /* do not write anything to FETCH_HEAD */
892 rc |= update_local_ref(ref, what, rm, ¬e,
896 format_display(¬e, '*',
897 *kind ? kind : "branch", NULL,
898 *what ? what : "HEAD",
899 "FETCH_HEAD", summary_width);
901 if (verbosity >= 0 && !shown_url) {
902 fprintf(stderr, _("From %.*s\n"),
907 fprintf(stderr, " %s\n", note.buf);
912 if (rc & STORE_REF_ERROR_DF_CONFLICT)
913 error(_("some local refs could not be updated; try running\n"
914 " 'git remote prune %s' to remove any old, conflicting "
915 "branches"), remote_name);
918 strbuf_release(¬e);
925 * We would want to bypass the object transfer altogether if
926 * everything we are going to fetch already exists and is connected
929 static int quickfetch(struct ref *ref_map)
931 struct ref *rm = ref_map;
932 struct check_connected_options opt = CHECK_CONNECTED_INIT;
935 * If we are deepening a shallow clone we already have these
936 * objects reachable. Running rev-list here will return with
937 * a good (0) exit status and we'll bypass the fetch that we
938 * really need to perform. Claiming failure now will ensure
939 * we perform the network exchange to deepen our history.
944 return check_connected(iterate_ref_map, &rm, &opt);
947 static int fetch_refs(struct transport *transport, struct ref *ref_map)
949 int ret = quickfetch(ref_map);
951 ret = transport_fetch_refs(transport, ref_map);
953 ret |= store_updated_refs(transport->url,
954 transport->remote->name,
956 transport_unlock_pack(transport);
960 static int prune_refs(struct refspec *refs, int ref_count, struct ref *ref_map,
963 int url_len, i, result = 0;
964 struct ref *ref, *stale_refs = get_stale_heads(refs, ref_count, ref_map);
966 int summary_width = transport_summary_width(stale_refs);
967 const char *dangling_msg = dry_run
968 ? _(" (%s will become dangling)")
969 : _(" (%s has become dangling)");
972 url = transport_anonymize_url(raw_url);
974 url = xstrdup("foreign");
976 url_len = strlen(url);
977 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
981 if (4 < i && !strncmp(".git", url + i - 3, 4))
985 struct string_list refnames = STRING_LIST_INIT_NODUP;
987 for (ref = stale_refs; ref; ref = ref->next)
988 string_list_append(&refnames, ref->name);
990 result = delete_refs("fetch: prune", &refnames, 0);
991 string_list_clear(&refnames, 0);
994 if (verbosity >= 0) {
995 for (ref = stale_refs; ref; ref = ref->next) {
996 struct strbuf sb = STRBUF_INIT;
998 fprintf(stderr, _("From %.*s\n"), url_len, url);
1001 format_display(&sb, '-', _("[deleted]"), NULL,
1002 _("(none)"), prettify_refname(ref->name),
1004 fprintf(stderr, " %s\n",sb.buf);
1005 strbuf_release(&sb);
1006 warn_dangling_symref(stderr, dangling_msg, ref->name);
1011 free_refs(stale_refs);
1015 static void check_not_current_branch(struct ref *ref_map)
1017 struct branch *current_branch = branch_get(NULL);
1019 if (is_bare_repository() || !current_branch)
1022 for (; ref_map; ref_map = ref_map->next)
1023 if (ref_map->peer_ref && !strcmp(current_branch->refname,
1024 ref_map->peer_ref->name))
1025 die(_("Refusing to fetch into current branch %s "
1026 "of non-bare repository"), current_branch->refname);
1029 static int truncate_fetch_head(void)
1031 const char *filename = git_path_fetch_head();
1032 FILE *fp = fopen_for_writing(filename);
1035 return error_errno(_("cannot open %s"), filename);
1040 static void set_option(struct transport *transport, const char *name, const char *value)
1042 int r = transport_set_option(transport, name, value);
1044 die(_("Option \"%s\" value \"%s\" is not valid for %s"),
1045 name, value, transport->url);
1047 warning(_("Option \"%s\" is ignored for %s\n"),
1048 name, transport->url);
1051 static struct transport *prepare_transport(struct remote *remote, int deepen)
1053 struct transport *transport;
1054 transport = transport_get(remote, NULL);
1055 transport_set_verbosity(transport, verbosity, progress);
1056 transport->family = family;
1058 set_option(transport, TRANS_OPT_UPLOADPACK, upload_pack);
1060 set_option(transport, TRANS_OPT_KEEP, "yes");
1062 set_option(transport, TRANS_OPT_DEPTH, depth);
1063 if (deepen && deepen_since)
1064 set_option(transport, TRANS_OPT_DEEPEN_SINCE, deepen_since);
1065 if (deepen && deepen_not.nr)
1066 set_option(transport, TRANS_OPT_DEEPEN_NOT,
1067 (const char *)&deepen_not);
1068 if (deepen_relative)
1069 set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, "yes");
1071 set_option(transport, TRANS_OPT_UPDATE_SHALLOW, "yes");
1072 if (filter_options.choice) {
1073 set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER,
1074 filter_options.filter_spec);
1075 set_option(transport, TRANS_OPT_FROM_PROMISOR, "1");
1080 static void backfill_tags(struct transport *transport, struct ref *ref_map)
1085 * Once we have set TRANS_OPT_DEEPEN_SINCE, we can't unset it
1086 * when remote helper is used (setting it to an empty string
1087 * is not unsetting). We could extend the remote helper
1088 * protocol for that, but for now, just force a new connection
1089 * without deepen-since. Similar story for deepen-not.
1091 cannot_reuse = transport->cannot_reuse ||
1092 deepen_since || deepen_not.nr;
1094 gsecondary = prepare_transport(transport->remote, 0);
1095 transport = gsecondary;
1098 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
1099 transport_set_option(transport, TRANS_OPT_DEPTH, "0");
1100 transport_set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, NULL);
1101 fetch_refs(transport, ref_map);
1104 transport_disconnect(gsecondary);
1109 static int do_fetch(struct transport *transport,
1110 struct refspec *refs, int ref_count)
1112 struct string_list existing_refs = STRING_LIST_INIT_DUP;
1113 struct ref *ref_map;
1115 int autotags = (transport->remote->fetch_tags == 1);
1118 for_each_ref(add_existing, &existing_refs);
1120 if (tags == TAGS_DEFAULT) {
1121 if (transport->remote->fetch_tags == 2)
1123 if (transport->remote->fetch_tags == -1)
1127 /* if not appending, truncate FETCH_HEAD */
1128 if (!append && !dry_run) {
1129 retcode = truncate_fetch_head();
1134 ref_map = get_ref_map(transport, refs, ref_count, tags, &autotags);
1135 if (!update_head_ok)
1136 check_not_current_branch(ref_map);
1138 for (rm = ref_map; rm; rm = rm->next) {
1140 struct string_list_item *peer_item =
1141 string_list_lookup(&existing_refs,
1142 rm->peer_ref->name);
1144 struct object_id *old_oid = peer_item->util;
1145 oidcpy(&rm->peer_ref->old_oid, old_oid);
1150 if (tags == TAGS_DEFAULT && autotags)
1151 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
1154 * We only prune based on refspecs specified
1155 * explicitly (via command line or configuration); we
1156 * don't care whether --tags was specified.
1159 prune_refs(refs, ref_count, ref_map, transport->url);
1161 prune_refs(transport->remote->fetch,
1162 transport->remote->fetch_refspec_nr,
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 static const char **refs = NULL;
1352 struct refspec *refspec;
1356 int maybe_prune_tags;
1357 int remote_via_config = remote_is_configured(remote, 0);
1360 die(_("No remote repository specified. Please, specify either a URL or a\n"
1361 "remote name from which new revisions should be fetched."));
1363 gtransport = prepare_transport(remote, 1);
1366 /* no command line request */
1367 if (0 <= remote->prune)
1368 prune = remote->prune;
1369 else if (0 <= fetch_prune_config)
1370 prune = fetch_prune_config;
1372 prune = PRUNE_BY_DEFAULT;
1375 if (prune_tags < 0) {
1376 /* no command line request */
1377 if (0 <= remote->prune_tags)
1378 prune_tags = remote->prune_tags;
1379 else if (0 <= fetch_prune_tags_config)
1380 prune_tags = fetch_prune_tags_config;
1382 prune_tags = PRUNE_TAGS_BY_DEFAULT;
1385 maybe_prune_tags = prune_tags_ok && prune_tags;
1386 if (maybe_prune_tags && remote_via_config)
1387 add_prune_tags_to_fetch_refspec(remote);
1389 if (argc > 0 || (maybe_prune_tags && !remote_via_config)) {
1390 size_t nr_alloc = st_add3(argc, maybe_prune_tags, 1);
1391 refs = xcalloc(nr_alloc, sizeof(const char *));
1392 if (maybe_prune_tags) {
1393 refs[j++] = xstrdup("refs/tags/*:refs/tags/*");
1400 for (i = 0; i < argc; i++) {
1401 if (!strcmp(argv[i], "tag")) {
1404 die(_("You need to specify a tag name."));
1405 refs[j++] = xstrfmt("refs/tags/%s:refs/tags/%s",
1408 refs[j++] = argv[i];
1413 sigchain_push_common(unlock_pack_on_signal);
1414 atexit(unlock_pack);
1415 refspec = parse_fetch_refspec(ref_nr, refs);
1416 exit_code = do_fetch(gtransport, refspec, ref_nr);
1417 free_refspec(ref_nr, refspec);
1418 transport_disconnect(gtransport);
1423 int cmd_fetch(int argc, const char **argv, const char *prefix)
1426 struct string_list list = STRING_LIST_INIT_DUP;
1427 struct remote *remote = NULL;
1429 int prune_tags_ok = 1;
1430 struct argv_array argv_gc_auto = ARGV_ARRAY_INIT;
1432 packet_trace_identity("fetch");
1434 fetch_if_missing = 0;
1436 /* Record the command line for the reflog */
1437 strbuf_addstr(&default_rla, "fetch");
1438 for (i = 1; i < argc; i++)
1439 strbuf_addf(&default_rla, " %s", argv[i]);
1441 config_from_gitmodules(gitmodules_fetch_config, NULL);
1442 git_config(git_fetch_config, NULL);
1444 argc = parse_options(argc, argv, prefix,
1445 builtin_fetch_options, builtin_fetch_usage, 0);
1447 if (deepen_relative) {
1448 if (deepen_relative < 0)
1449 die(_("Negative depth in --deepen is not supported"));
1451 die(_("--deepen and --depth are mutually exclusive"));
1452 depth = xstrfmt("%d", deepen_relative);
1456 die(_("--depth and --unshallow cannot be used together"));
1457 else if (!is_repository_shallow())
1458 die(_("--unshallow on a complete repository does not make sense"));
1460 depth = xstrfmt("%d", INFINITE_DEPTH);
1463 /* no need to be strict, transport_set_option() will validate it again */
1464 if (depth && atoi(depth) < 1)
1465 die(_("depth %s is not a positive number"), depth);
1466 if (depth || deepen_since || deepen_not.nr)
1469 if (filter_options.choice && !repository_format_partial_clone)
1470 die("--filter can only be used when extensions.partialClone is set");
1474 die(_("fetch --all does not take a repository argument"));
1476 die(_("fetch --all does not make sense with refspecs"));
1477 (void) for_each_remote(get_one_remote_for_fetch, &list);
1478 } else if (argc == 0) {
1479 /* No arguments -- use default remote */
1480 remote = remote_get(NULL);
1481 } else if (multiple) {
1482 /* All arguments are assumed to be remotes or groups */
1483 for (i = 0; i < argc; i++)
1484 if (!add_remote_or_group(argv[i], &list))
1485 die(_("No such remote or remote group: %s"), argv[i]);
1487 /* Single remote or group */
1488 (void) add_remote_or_group(argv[0], &list);
1490 /* More than one remote */
1492 die(_("Fetching a group and specifying refspecs does not make sense"));
1494 /* Zero or one remotes */
1495 remote = remote_get(argv[0]);
1496 prune_tags_ok = (argc == 1);
1503 if (filter_options.choice || repository_format_partial_clone)
1504 fetch_one_setup_partial(remote);
1505 result = fetch_one(remote, argc, argv, prune_tags_ok);
1507 if (filter_options.choice)
1508 die(_("--filter can only be used with the remote configured in core.partialClone"));
1509 /* TODO should this also die if we have a previous partial-clone? */
1510 result = fetch_multiple(&list);
1513 if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
1514 struct argv_array options = ARGV_ARRAY_INIT;
1516 add_options_to_argv(&options);
1517 result = fetch_populated_submodules(the_repository,
1521 recurse_submodules_default,
1524 argv_array_clear(&options);
1527 string_list_clear(&list, 0);
1531 argv_array_pushl(&argv_gc_auto, "gc", "--auto", NULL);
1533 argv_array_push(&argv_gc_auto, "--quiet");
1534 run_command_v_opt(argv_gc_auto.argv, RUN_GIT_CMD);
1535 argv_array_clear(&argv_gc_auto);