8 #include "string-list.h"
10 #include "transport.h"
11 #include "run-command.h"
12 #include "parse-options.h"
14 #include "submodule-config.h"
15 #include "submodule.h"
16 #include "connected.h"
17 #include "argv-array.h"
20 static const char * const builtin_fetch_usage[] = {
21 N_("git fetch [<options>] [<repository> [<refspec>...]]"),
22 N_("git fetch [<options>] <group>"),
23 N_("git fetch --multiple [<options>] [(<repository> | <group>)...]"),
24 N_("git fetch --all [<options>]"),
34 static int fetch_prune_config = -1; /* unspecified */
35 static int prune = -1; /* unspecified */
36 #define PRUNE_BY_DEFAULT 0 /* do we prune by default? */
38 static int all, append, dry_run, force, keep, multiple, update_head_ok, verbosity, deepen_relative;
39 static int progress = -1, recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
40 static int tags = TAGS_DEFAULT, unshallow, update_shallow, deepen;
41 static int max_children = -1;
42 static enum transport_family family;
43 static const char *depth;
44 static const char *deepen_since;
45 static const char *upload_pack;
46 static struct string_list deepen_not = STRING_LIST_INIT_NODUP;
47 static struct strbuf default_rla = STRBUF_INIT;
48 static struct transport *gtransport;
49 static struct transport *gsecondary;
50 static const char *submodule_prefix = "";
51 static const char *recurse_submodules_default;
52 static int shown_url = 0;
53 static int refmap_alloc, refmap_nr;
54 static const char **refmap_array;
56 static int option_parse_recurse_submodules(const struct option *opt,
57 const char *arg, int unset)
60 recurse_submodules = RECURSE_SUBMODULES_OFF;
63 recurse_submodules = parse_fetch_recurse_submodules_arg(opt->long_name, arg);
65 recurse_submodules = RECURSE_SUBMODULES_ON;
70 static int git_fetch_config(const char *k, const char *v, void *cb)
72 if (!strcmp(k, "fetch.prune")) {
73 fetch_prune_config = git_config_bool(k, v);
77 if (!strcmp(k, "submodule.recurse")) {
78 int r = git_config_bool(k, v) ?
79 RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;
80 recurse_submodules = r;
83 return git_default_config(k, v, cb);
86 static int parse_refmap_arg(const struct option *opt, const char *arg, int unset)
88 ALLOC_GROW(refmap_array, refmap_nr + 1, refmap_alloc);
91 * "git fetch --refmap='' origin foo"
92 * can be used to tell the command not to store anywhere
95 refmap_array[refmap_nr++] = arg;
99 static struct option builtin_fetch_options[] = {
100 OPT__VERBOSITY(&verbosity),
101 OPT_BOOL(0, "all", &all,
102 N_("fetch from all remotes")),
103 OPT_BOOL('a', "append", &append,
104 N_("append to .git/FETCH_HEAD instead of overwriting")),
105 OPT_STRING(0, "upload-pack", &upload_pack, N_("path"),
106 N_("path to upload pack on remote end")),
107 OPT__FORCE(&force, N_("force overwrite of local branch")),
108 OPT_BOOL('m', "multiple", &multiple,
109 N_("fetch from multiple remotes")),
110 OPT_SET_INT('t', "tags", &tags,
111 N_("fetch all tags and associated objects"), TAGS_SET),
112 OPT_SET_INT('n', NULL, &tags,
113 N_("do not fetch all tags (--no-tags)"), TAGS_UNSET),
114 OPT_INTEGER('j', "jobs", &max_children,
115 N_("number of submodules fetched in parallel")),
116 OPT_BOOL('p', "prune", &prune,
117 N_("prune remote-tracking branches no longer on remote")),
118 { OPTION_CALLBACK, 0, "recurse-submodules", NULL, N_("on-demand"),
119 N_("control recursive fetching of submodules"),
120 PARSE_OPT_OPTARG, option_parse_recurse_submodules },
121 OPT_BOOL(0, "dry-run", &dry_run,
123 OPT_BOOL('k', "keep", &keep, N_("keep downloaded pack")),
124 OPT_BOOL('u', "update-head-ok", &update_head_ok,
125 N_("allow updating of HEAD ref")),
126 OPT_BOOL(0, "progress", &progress, N_("force progress reporting")),
127 OPT_STRING(0, "depth", &depth, N_("depth"),
128 N_("deepen history of shallow clone")),
129 OPT_STRING(0, "shallow-since", &deepen_since, N_("time"),
130 N_("deepen history of shallow repository based on time")),
131 OPT_STRING_LIST(0, "shallow-exclude", &deepen_not, N_("revision"),
132 N_("deepen history of shallow clone, excluding rev")),
133 OPT_INTEGER(0, "deepen", &deepen_relative,
134 N_("deepen history of shallow clone")),
135 { OPTION_SET_INT, 0, "unshallow", &unshallow, NULL,
136 N_("convert to a complete repository"),
137 PARSE_OPT_NONEG | PARSE_OPT_NOARG, NULL, 1 },
138 { OPTION_STRING, 0, "submodule-prefix", &submodule_prefix, N_("dir"),
139 N_("prepend this to submodule path output"), PARSE_OPT_HIDDEN },
140 { OPTION_STRING, 0, "recurse-submodules-default",
141 &recurse_submodules_default, NULL,
142 N_("default mode for recursion"), PARSE_OPT_HIDDEN },
143 OPT_BOOL(0, "update-shallow", &update_shallow,
144 N_("accept refs that update .git/shallow")),
145 { OPTION_CALLBACK, 0, "refmap", NULL, N_("refmap"),
146 N_("specify fetch refmap"), PARSE_OPT_NONEG, parse_refmap_arg },
147 OPT_SET_INT('4', "ipv4", &family, N_("use IPv4 addresses only"),
148 TRANSPORT_FAMILY_IPV4),
149 OPT_SET_INT('6', "ipv6", &family, N_("use IPv6 addresses only"),
150 TRANSPORT_FAMILY_IPV6),
154 static void unlock_pack(void)
157 transport_unlock_pack(gtransport);
159 transport_unlock_pack(gsecondary);
162 static void unlock_pack_on_signal(int signo)
169 static void add_merge_config(struct ref **head,
170 const struct ref *remote_refs,
171 struct branch *branch,
176 for (i = 0; i < branch->merge_nr; i++) {
177 struct ref *rm, **old_tail = *tail;
178 struct refspec refspec;
180 for (rm = *head; rm; rm = rm->next) {
181 if (branch_merge_matches(branch, i, rm->name)) {
182 rm->fetch_head_status = FETCH_HEAD_MERGE;
190 * Not fetched to a remote-tracking branch? We need to fetch
191 * it anyway to allow this branch's "branch.$name.merge"
192 * to be honored by 'git pull', but we do not have to
193 * fail if branch.$name.merge is misconfigured to point
194 * at a nonexisting branch. If we were indeed called by
195 * 'git pull', it will notice the misconfiguration because
196 * there is no entry in the resulting FETCH_HEAD marked
199 memset(&refspec, 0, sizeof(refspec));
200 refspec.src = branch->merge[i]->src;
201 get_fetch_map(remote_refs, &refspec, tail, 1);
202 for (rm = *old_tail; rm; rm = rm->next)
203 rm->fetch_head_status = FETCH_HEAD_MERGE;
207 static int add_existing(const char *refname, const struct object_id *oid,
208 int flag, void *cbdata)
210 struct string_list *list = (struct string_list *)cbdata;
211 struct string_list_item *item = string_list_insert(list, refname);
212 struct object_id *old_oid = xmalloc(sizeof(*old_oid));
214 oidcpy(old_oid, oid);
215 item->util = old_oid;
219 static int will_fetch(struct ref **head, const unsigned char *sha1)
221 struct ref *rm = *head;
223 if (!hashcmp(rm->old_oid.hash, sha1))
230 static void find_non_local_tags(struct transport *transport,
234 struct string_list existing_refs = STRING_LIST_INIT_DUP;
235 struct string_list remote_refs = STRING_LIST_INIT_NODUP;
236 const struct ref *ref;
237 struct string_list_item *item = NULL;
239 for_each_ref(add_existing, &existing_refs);
240 for (ref = transport_get_remote_refs(transport); ref; ref = ref->next) {
241 if (!starts_with(ref->name, "refs/tags/"))
245 * The peeled ref always follows the matching base
246 * ref, so if we see a peeled ref that we don't want
247 * to fetch then we can mark the ref entry in the list
248 * as one to ignore by setting util to NULL.
250 if (ends_with(ref->name, "^{}")) {
252 !has_object_file_with_flags(&ref->old_oid, HAS_SHA1_QUICK) &&
253 !will_fetch(head, ref->old_oid.hash) &&
254 !has_sha1_file_with_flags(item->util, HAS_SHA1_QUICK) &&
255 !will_fetch(head, item->util))
262 * If item is non-NULL here, then we previously saw a
263 * ref not followed by a peeled reference, so we need
264 * to check if it is a lightweight tag that we want to
268 !has_sha1_file_with_flags(item->util, HAS_SHA1_QUICK) &&
269 !will_fetch(head, item->util))
274 /* skip duplicates and refs that we already have */
275 if (string_list_has_string(&remote_refs, ref->name) ||
276 string_list_has_string(&existing_refs, ref->name))
279 item = string_list_insert(&remote_refs, ref->name);
280 item->util = (void *)&ref->old_oid;
282 string_list_clear(&existing_refs, 1);
285 * We may have a final lightweight tag that needs to be
286 * checked to see if it needs fetching.
289 !has_sha1_file_with_flags(item->util, HAS_SHA1_QUICK) &&
290 !will_fetch(head, item->util))
294 * For all the tags in the remote_refs string list,
295 * add them to the list of refs to be fetched
297 for_each_string_list_item(item, &remote_refs) {
298 /* Unless we have already decided to ignore this item... */
301 struct ref *rm = alloc_ref(item->string);
302 rm->peer_ref = alloc_ref(item->string);
303 oidcpy(&rm->old_oid, item->util);
309 string_list_clear(&remote_refs, 0);
312 static struct ref *get_ref_map(struct transport *transport,
313 struct refspec *refspecs, int refspec_count,
314 int tags, int *autotags)
318 struct ref *ref_map = NULL;
319 struct ref **tail = &ref_map;
321 /* opportunistically-updated references: */
322 struct ref *orefs = NULL, **oref_tail = &orefs;
324 const struct ref *remote_refs = transport_get_remote_refs(transport);
327 struct refspec *fetch_refspec;
328 int fetch_refspec_nr;
330 for (i = 0; i < refspec_count; i++) {
331 get_fetch_map(remote_refs, &refspecs[i], &tail, 0);
332 if (refspecs[i].dst && refspecs[i].dst[0])
335 /* Merge everything on the command line (but not --tags) */
336 for (rm = ref_map; rm; rm = rm->next)
337 rm->fetch_head_status = FETCH_HEAD_MERGE;
340 * For any refs that we happen to be fetching via
341 * command-line arguments, the destination ref might
342 * have been missing or have been different than the
343 * remote-tracking ref that would be derived from the
344 * configured refspec. In these cases, we want to
345 * take the opportunity to update their configured
346 * remote-tracking reference. However, we do not want
347 * to mention these entries in FETCH_HEAD at all, as
348 * they would simply be duplicates of existing
349 * entries, so we set them FETCH_HEAD_IGNORE below.
351 * We compute these entries now, based only on the
352 * refspecs specified on the command line. But we add
353 * them to the list following the refspecs resulting
354 * from the tags option so that one of the latter,
355 * which has FETCH_HEAD_NOT_FOR_MERGE, is not removed
356 * by ref_remove_duplicates() in favor of one of these
357 * opportunistic entries with FETCH_HEAD_IGNORE.
360 fetch_refspec = parse_fetch_refspec(refmap_nr, refmap_array);
361 fetch_refspec_nr = refmap_nr;
363 fetch_refspec = transport->remote->fetch;
364 fetch_refspec_nr = transport->remote->fetch_refspec_nr;
367 for (i = 0; i < fetch_refspec_nr; i++)
368 get_fetch_map(ref_map, &fetch_refspec[i], &oref_tail, 1);
369 } else if (refmap_array) {
370 die("--refmap option is only meaningful with command-line refspec(s).");
372 /* Use the defaults */
373 struct remote *remote = transport->remote;
374 struct branch *branch = branch_get(NULL);
375 int has_merge = branch_has_merge_config(branch);
377 (remote->fetch_refspec_nr ||
378 /* Note: has_merge implies non-NULL branch->remote_name */
379 (has_merge && !strcmp(branch->remote_name, remote->name)))) {
380 for (i = 0; i < remote->fetch_refspec_nr; i++) {
381 get_fetch_map(remote_refs, &remote->fetch[i], &tail, 0);
382 if (remote->fetch[i].dst &&
383 remote->fetch[i].dst[0])
385 if (!i && !has_merge && ref_map &&
386 !remote->fetch[0].pattern)
387 ref_map->fetch_head_status = FETCH_HEAD_MERGE;
390 * if the remote we're fetching from is the same
391 * as given in branch.<name>.remote, we add the
392 * ref given in branch.<name>.merge, too.
394 * Note: has_merge implies non-NULL branch->remote_name
397 !strcmp(branch->remote_name, remote->name))
398 add_merge_config(&ref_map, remote_refs, branch, &tail);
400 ref_map = get_remote_ref(remote_refs, "HEAD");
402 die(_("Couldn't find remote ref HEAD"));
403 ref_map->fetch_head_status = FETCH_HEAD_MERGE;
404 tail = &ref_map->next;
408 if (tags == TAGS_SET)
409 /* also fetch all tags */
410 get_fetch_map(remote_refs, tag_refspec, &tail, 0);
411 else if (tags == TAGS_DEFAULT && *autotags)
412 find_non_local_tags(transport, &ref_map, &tail);
414 /* Now append any refs to be updated opportunistically: */
416 for (rm = orefs; rm; rm = rm->next) {
417 rm->fetch_head_status = FETCH_HEAD_IGNORE;
421 return ref_remove_duplicates(ref_map);
424 #define STORE_REF_ERROR_OTHER 1
425 #define STORE_REF_ERROR_DF_CONFLICT 2
427 static int s_update_ref(const char *action,
432 char *rla = getenv("GIT_REFLOG_ACTION");
433 struct ref_transaction *transaction;
434 struct strbuf err = STRBUF_INIT;
435 int ret, df_conflict = 0;
440 rla = default_rla.buf;
441 msg = xstrfmt("%s: %s", rla, action);
443 transaction = ref_transaction_begin(&err);
445 ref_transaction_update(transaction, ref->name,
447 check_old ? ref->old_oid.hash : NULL,
451 ret = ref_transaction_commit(transaction, &err);
453 df_conflict = (ret == TRANSACTION_NAME_CONFLICT);
457 ref_transaction_free(transaction);
458 strbuf_release(&err);
462 ref_transaction_free(transaction);
463 error("%s", err.buf);
464 strbuf_release(&err);
466 return df_conflict ? STORE_REF_ERROR_DF_CONFLICT
467 : STORE_REF_ERROR_OTHER;
470 static int refcol_width = 10;
471 static int compact_format;
473 static void adjust_refcol_width(const struct ref *ref)
475 int max, rlen, llen, len;
477 /* uptodate lines are only shown on high verbosity level */
478 if (!verbosity && !oidcmp(&ref->peer_ref->old_oid, &ref->old_oid))
481 max = term_columns();
482 rlen = utf8_strwidth(prettify_refname(ref->name));
484 llen = utf8_strwidth(prettify_refname(ref->peer_ref->name));
487 * rough estimation to see if the output line is too long and
488 * should not be counted (we can't do precise calculation
489 * anyway because we don't know if the error explanation part
490 * will be printed in update_local_ref)
492 if (compact_format) {
496 len = 21 /* flag and summary */ + rlen + 4 /* -> */ + llen;
501 * Not precise calculation for compact mode because '*' can
502 * appear on the left hand side of '->' and shrink the column
505 if (refcol_width < rlen)
509 static void prepare_format_display(struct ref *ref_map)
512 const char *format = "full";
514 git_config_get_string_const("fetch.output", &format);
515 if (!strcasecmp(format, "full"))
517 else if (!strcasecmp(format, "compact"))
520 die(_("configuration fetch.output contains invalid value %s"),
523 for (rm = ref_map; rm; rm = rm->next) {
524 if (rm->status == REF_STATUS_REJECT_SHALLOW ||
526 !strcmp(rm->name, "HEAD"))
529 adjust_refcol_width(rm);
533 static void print_remote_to_local(struct strbuf *display,
534 const char *remote, const char *local)
536 strbuf_addf(display, "%-*s -> %s", refcol_width, remote, local);
539 static int find_and_replace(struct strbuf *haystack,
541 const char *placeholder)
543 const char *p = strstr(haystack->buf, needle);
549 if (p > haystack->buf && p[-1] != '/')
553 nlen = strlen(needle);
554 if (plen > nlen && p[nlen] != '/')
557 strbuf_splice(haystack, p - haystack->buf, nlen,
558 placeholder, strlen(placeholder));
562 static void print_compact(struct strbuf *display,
563 const char *remote, const char *local)
565 struct strbuf r = STRBUF_INIT;
566 struct strbuf l = STRBUF_INIT;
568 if (!strcmp(remote, local)) {
569 strbuf_addf(display, "%-*s -> *", refcol_width, remote);
573 strbuf_addstr(&r, remote);
574 strbuf_addstr(&l, local);
576 if (!find_and_replace(&r, local, "*"))
577 find_and_replace(&l, remote, "*");
578 print_remote_to_local(display, r.buf, l.buf);
584 static void format_display(struct strbuf *display, char code,
585 const char *summary, const char *error,
586 const char *remote, const char *local,
589 int width = (summary_width + strlen(summary) - gettext_width(summary));
591 strbuf_addf(display, "%c %-*s ", code, width, summary);
593 print_remote_to_local(display, remote, local);
595 print_compact(display, remote, local);
597 strbuf_addf(display, " (%s)", error);
600 static int update_local_ref(struct ref *ref,
602 const struct ref *remote_ref,
603 struct strbuf *display,
606 struct commit *current = NULL, *updated;
607 enum object_type type;
608 struct branch *current_branch = branch_get(NULL);
609 const char *pretty_ref = prettify_refname(ref->name);
611 type = sha1_object_info(ref->new_oid.hash, NULL);
613 die(_("object %s not found"), oid_to_hex(&ref->new_oid));
615 if (!oidcmp(&ref->old_oid, &ref->new_oid)) {
617 format_display(display, '=', _("[up to date]"), NULL,
618 remote, pretty_ref, summary_width);
622 if (current_branch &&
623 !strcmp(ref->name, current_branch->name) &&
624 !(update_head_ok || is_bare_repository()) &&
625 !is_null_oid(&ref->old_oid)) {
627 * If this is the head, and it's not okay to update
628 * the head, and the old value of the head isn't empty...
630 format_display(display, '!', _("[rejected]"),
631 _("can't fetch in current branch"),
632 remote, pretty_ref, summary_width);
636 if (!is_null_oid(&ref->old_oid) &&
637 starts_with(ref->name, "refs/tags/")) {
639 r = s_update_ref("updating tag", ref, 0);
640 format_display(display, r ? '!' : 't', _("[tag update]"),
641 r ? _("unable to update local ref") : NULL,
642 remote, pretty_ref, summary_width);
646 current = lookup_commit_reference_gently(&ref->old_oid, 1);
647 updated = lookup_commit_reference_gently(&ref->new_oid, 1);
648 if (!current || !updated) {
653 * Nicely describe the new ref we're fetching.
654 * Base this on the remote's ref name, as it's
655 * more likely to follow a standard layout.
657 const char *name = remote_ref ? remote_ref->name : "";
658 if (starts_with(name, "refs/tags/")) {
660 what = _("[new tag]");
661 } else if (starts_with(name, "refs/heads/")) {
662 msg = "storing head";
663 what = _("[new branch]");
666 what = _("[new ref]");
669 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
670 (recurse_submodules != RECURSE_SUBMODULES_ON))
671 check_for_new_submodule_commits(&ref->new_oid);
672 r = s_update_ref(msg, ref, 0);
673 format_display(display, r ? '!' : '*', what,
674 r ? _("unable to update local ref") : NULL,
675 remote, pretty_ref, summary_width);
679 if (in_merge_bases(current, updated)) {
680 struct strbuf quickref = STRBUF_INIT;
682 strbuf_add_unique_abbrev(&quickref, current->object.oid.hash, DEFAULT_ABBREV);
683 strbuf_addstr(&quickref, "..");
684 strbuf_add_unique_abbrev(&quickref, ref->new_oid.hash, DEFAULT_ABBREV);
685 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
686 (recurse_submodules != RECURSE_SUBMODULES_ON))
687 check_for_new_submodule_commits(&ref->new_oid);
688 r = s_update_ref("fast-forward", ref, 1);
689 format_display(display, r ? '!' : ' ', quickref.buf,
690 r ? _("unable to update local ref") : NULL,
691 remote, pretty_ref, summary_width);
692 strbuf_release(&quickref);
694 } else if (force || ref->force) {
695 struct strbuf quickref = STRBUF_INIT;
697 strbuf_add_unique_abbrev(&quickref, current->object.oid.hash, DEFAULT_ABBREV);
698 strbuf_addstr(&quickref, "...");
699 strbuf_add_unique_abbrev(&quickref, ref->new_oid.hash, DEFAULT_ABBREV);
700 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
701 (recurse_submodules != RECURSE_SUBMODULES_ON))
702 check_for_new_submodule_commits(&ref->new_oid);
703 r = s_update_ref("forced-update", ref, 1);
704 format_display(display, r ? '!' : '+', quickref.buf,
705 r ? _("unable to update local ref") : _("forced update"),
706 remote, pretty_ref, summary_width);
707 strbuf_release(&quickref);
710 format_display(display, '!', _("[rejected]"), _("non-fast-forward"),
711 remote, pretty_ref, summary_width);
716 static int iterate_ref_map(void *cb_data, unsigned char sha1[20])
718 struct ref **rm = cb_data;
719 struct ref *ref = *rm;
721 while (ref && ref->status == REF_STATUS_REJECT_SHALLOW)
724 return -1; /* end of the list */
726 hashcpy(sha1, ref->old_oid.hash);
730 static int store_updated_refs(const char *raw_url, const char *remote_name,
734 struct commit *commit;
735 int url_len, i, rc = 0;
736 struct strbuf note = STRBUF_INIT;
737 const char *what, *kind;
740 const char *filename = dry_run ? "/dev/null" : git_path_fetch_head();
742 int summary_width = transport_summary_width(ref_map);
744 fp = fopen(filename, "a");
746 return error_errno(_("cannot open %s"), filename);
749 url = transport_anonymize_url(raw_url);
751 url = xstrdup("foreign");
754 if (check_connected(iterate_ref_map, &rm, NULL)) {
755 rc = error(_("%s did not send all necessary objects\n"), url);
759 prepare_format_display(ref_map);
762 * We do a pass for each fetch_head_status type in their enum order, so
763 * merged entries are written before not-for-merge. That lets readers
764 * use FETCH_HEAD as a refname to refer to the ref to be merged.
766 for (want_status = FETCH_HEAD_MERGE;
767 want_status <= FETCH_HEAD_IGNORE;
769 for (rm = ref_map; rm; rm = rm->next) {
770 struct ref *ref = NULL;
771 const char *merge_status_marker = "";
773 if (rm->status == REF_STATUS_REJECT_SHALLOW) {
774 if (want_status == FETCH_HEAD_MERGE)
775 warning(_("reject %s because shallow roots are not allowed to be updated"),
776 rm->peer_ref ? rm->peer_ref->name : rm->name);
780 commit = lookup_commit_reference_gently(&rm->old_oid,
783 rm->fetch_head_status = FETCH_HEAD_NOT_FOR_MERGE;
785 if (rm->fetch_head_status != want_status)
789 ref = alloc_ref(rm->peer_ref->name);
790 oidcpy(&ref->old_oid, &rm->peer_ref->old_oid);
791 oidcpy(&ref->new_oid, &rm->old_oid);
792 ref->force = rm->peer_ref->force;
796 if (!strcmp(rm->name, "HEAD")) {
800 else if (starts_with(rm->name, "refs/heads/")) {
802 what = rm->name + 11;
804 else if (starts_with(rm->name, "refs/tags/")) {
806 what = rm->name + 10;
808 else if (starts_with(rm->name, "refs/remotes/")) {
809 kind = "remote-tracking branch";
810 what = rm->name + 13;
817 url_len = strlen(url);
818 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
821 if (4 < i && !strncmp(".git", url + i - 3, 4))
827 strbuf_addf(¬e, "%s ", kind);
828 strbuf_addf(¬e, "'%s' of ", what);
830 switch (rm->fetch_head_status) {
831 case FETCH_HEAD_NOT_FOR_MERGE:
832 merge_status_marker = "not-for-merge";
834 case FETCH_HEAD_MERGE:
835 fprintf(fp, "%s\t%s\t%s",
836 oid_to_hex(&rm->old_oid),
839 for (i = 0; i < url_len; ++i)
847 /* do not write anything to FETCH_HEAD */
853 rc |= update_local_ref(ref, what, rm, ¬e,
857 format_display(¬e, '*',
858 *kind ? kind : "branch", NULL,
859 *what ? what : "HEAD",
860 "FETCH_HEAD", summary_width);
862 if (verbosity >= 0 && !shown_url) {
863 fprintf(stderr, _("From %.*s\n"),
868 fprintf(stderr, " %s\n", note.buf);
873 if (rc & STORE_REF_ERROR_DF_CONFLICT)
874 error(_("some local refs could not be updated; try running\n"
875 " 'git remote prune %s' to remove any old, conflicting "
876 "branches"), remote_name);
879 strbuf_release(¬e);
886 * We would want to bypass the object transfer altogether if
887 * everything we are going to fetch already exists and is connected
890 static int quickfetch(struct ref *ref_map)
892 struct ref *rm = ref_map;
893 struct check_connected_options opt = CHECK_CONNECTED_INIT;
896 * If we are deepening a shallow clone we already have these
897 * objects reachable. Running rev-list here will return with
898 * a good (0) exit status and we'll bypass the fetch that we
899 * really need to perform. Claiming failure now will ensure
900 * we perform the network exchange to deepen our history.
905 return check_connected(iterate_ref_map, &rm, &opt);
908 static int fetch_refs(struct transport *transport, struct ref *ref_map)
910 int ret = quickfetch(ref_map);
912 ret = transport_fetch_refs(transport, ref_map);
914 ret |= store_updated_refs(transport->url,
915 transport->remote->name,
917 transport_unlock_pack(transport);
921 static int prune_refs(struct refspec *refs, int ref_count, struct ref *ref_map,
924 int url_len, i, result = 0;
925 struct ref *ref, *stale_refs = get_stale_heads(refs, ref_count, ref_map);
927 int summary_width = transport_summary_width(stale_refs);
928 const char *dangling_msg = dry_run
929 ? _(" (%s will become dangling)")
930 : _(" (%s has become dangling)");
933 url = transport_anonymize_url(raw_url);
935 url = xstrdup("foreign");
937 url_len = strlen(url);
938 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
942 if (4 < i && !strncmp(".git", url + i - 3, 4))
946 struct string_list refnames = STRING_LIST_INIT_NODUP;
948 for (ref = stale_refs; ref; ref = ref->next)
949 string_list_append(&refnames, ref->name);
951 result = delete_refs("fetch: prune", &refnames, 0);
952 string_list_clear(&refnames, 0);
955 if (verbosity >= 0) {
956 for (ref = stale_refs; ref; ref = ref->next) {
957 struct strbuf sb = STRBUF_INIT;
959 fprintf(stderr, _("From %.*s\n"), url_len, url);
962 format_display(&sb, '-', _("[deleted]"), NULL,
963 _("(none)"), prettify_refname(ref->name),
965 fprintf(stderr, " %s\n",sb.buf);
967 warn_dangling_symref(stderr, dangling_msg, ref->name);
972 free_refs(stale_refs);
976 static void check_not_current_branch(struct ref *ref_map)
978 struct branch *current_branch = branch_get(NULL);
980 if (is_bare_repository() || !current_branch)
983 for (; ref_map; ref_map = ref_map->next)
984 if (ref_map->peer_ref && !strcmp(current_branch->refname,
985 ref_map->peer_ref->name))
986 die(_("Refusing to fetch into current branch %s "
987 "of non-bare repository"), current_branch->refname);
990 static int truncate_fetch_head(void)
992 const char *filename = git_path_fetch_head();
993 FILE *fp = fopen_for_writing(filename);
996 return error_errno(_("cannot open %s"), filename);
1001 static void set_option(struct transport *transport, const char *name, const char *value)
1003 int r = transport_set_option(transport, name, value);
1005 die(_("Option \"%s\" value \"%s\" is not valid for %s"),
1006 name, value, transport->url);
1008 warning(_("Option \"%s\" is ignored for %s\n"),
1009 name, transport->url);
1012 static struct transport *prepare_transport(struct remote *remote, int deepen)
1014 struct transport *transport;
1015 transport = transport_get(remote, NULL);
1016 transport_set_verbosity(transport, verbosity, progress);
1017 transport->family = family;
1019 set_option(transport, TRANS_OPT_UPLOADPACK, upload_pack);
1021 set_option(transport, TRANS_OPT_KEEP, "yes");
1023 set_option(transport, TRANS_OPT_DEPTH, depth);
1024 if (deepen && deepen_since)
1025 set_option(transport, TRANS_OPT_DEEPEN_SINCE, deepen_since);
1026 if (deepen && deepen_not.nr)
1027 set_option(transport, TRANS_OPT_DEEPEN_NOT,
1028 (const char *)&deepen_not);
1029 if (deepen_relative)
1030 set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, "yes");
1032 set_option(transport, TRANS_OPT_UPDATE_SHALLOW, "yes");
1036 static void backfill_tags(struct transport *transport, struct ref *ref_map)
1041 * Once we have set TRANS_OPT_DEEPEN_SINCE, we can't unset it
1042 * when remote helper is used (setting it to an empty string
1043 * is not unsetting). We could extend the remote helper
1044 * protocol for that, but for now, just force a new connection
1045 * without deepen-since. Similar story for deepen-not.
1047 cannot_reuse = transport->cannot_reuse ||
1048 deepen_since || deepen_not.nr;
1050 gsecondary = prepare_transport(transport->remote, 0);
1051 transport = gsecondary;
1054 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
1055 transport_set_option(transport, TRANS_OPT_DEPTH, "0");
1056 transport_set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, NULL);
1057 fetch_refs(transport, ref_map);
1060 transport_disconnect(gsecondary);
1065 static int do_fetch(struct transport *transport,
1066 struct refspec *refs, int ref_count)
1068 struct string_list existing_refs = STRING_LIST_INIT_DUP;
1069 struct ref *ref_map;
1071 int autotags = (transport->remote->fetch_tags == 1);
1074 for_each_ref(add_existing, &existing_refs);
1076 if (tags == TAGS_DEFAULT) {
1077 if (transport->remote->fetch_tags == 2)
1079 if (transport->remote->fetch_tags == -1)
1083 if (!transport->get_refs_list || !transport->fetch)
1084 die(_("Don't know how to fetch from %s"), transport->url);
1086 /* if not appending, truncate FETCH_HEAD */
1087 if (!append && !dry_run) {
1088 retcode = truncate_fetch_head();
1093 ref_map = get_ref_map(transport, refs, ref_count, tags, &autotags);
1094 if (!update_head_ok)
1095 check_not_current_branch(ref_map);
1097 for (rm = ref_map; rm; rm = rm->next) {
1099 struct string_list_item *peer_item =
1100 string_list_lookup(&existing_refs,
1101 rm->peer_ref->name);
1103 struct object_id *old_oid = peer_item->util;
1104 oidcpy(&rm->peer_ref->old_oid, old_oid);
1109 if (tags == TAGS_DEFAULT && autotags)
1110 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
1113 * We only prune based on refspecs specified
1114 * explicitly (via command line or configuration); we
1115 * don't care whether --tags was specified.
1118 prune_refs(refs, ref_count, ref_map, transport->url);
1120 prune_refs(transport->remote->fetch,
1121 transport->remote->fetch_refspec_nr,
1126 if (fetch_refs(transport, ref_map)) {
1133 /* if neither --no-tags nor --tags was specified, do automated tag
1135 if (tags == TAGS_DEFAULT && autotags) {
1136 struct ref **tail = &ref_map;
1138 find_non_local_tags(transport, &ref_map, &tail);
1140 backfill_tags(transport, ref_map);
1145 string_list_clear(&existing_refs, 1);
1149 static int get_one_remote_for_fetch(struct remote *remote, void *priv)
1151 struct string_list *list = priv;
1152 if (!remote->skip_default_update)
1153 string_list_append(list, remote->name);
1157 struct remote_group_data {
1159 struct string_list *list;
1162 static int get_remote_group(const char *key, const char *value, void *priv)
1164 struct remote_group_data *g = priv;
1166 if (skip_prefix(key, "remotes.", &key) && !strcmp(key, g->name)) {
1167 /* split list by white space */
1169 size_t wordlen = strcspn(value, " \t\n");
1172 string_list_append_nodup(g->list,
1173 xstrndup(value, wordlen));
1174 value += wordlen + (value[wordlen] != '\0');
1181 static int add_remote_or_group(const char *name, struct string_list *list)
1183 int prev_nr = list->nr;
1184 struct remote_group_data g;
1185 g.name = name; g.list = list;
1187 git_config(get_remote_group, &g);
1188 if (list->nr == prev_nr) {
1189 struct remote *remote = remote_get(name);
1190 if (!remote_is_configured(remote, 0))
1192 string_list_append(list, remote->name);
1197 static void add_options_to_argv(struct argv_array *argv)
1200 argv_array_push(argv, "--dry-run");
1202 argv_array_push(argv, prune ? "--prune" : "--no-prune");
1204 argv_array_push(argv, "--update-head-ok");
1206 argv_array_push(argv, "--force");
1208 argv_array_push(argv, "--keep");
1209 if (recurse_submodules == RECURSE_SUBMODULES_ON)
1210 argv_array_push(argv, "--recurse-submodules");
1211 else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND)
1212 argv_array_push(argv, "--recurse-submodules=on-demand");
1213 if (tags == TAGS_SET)
1214 argv_array_push(argv, "--tags");
1215 else if (tags == TAGS_UNSET)
1216 argv_array_push(argv, "--no-tags");
1218 argv_array_push(argv, "-v");
1220 argv_array_push(argv, "-v");
1221 else if (verbosity < 0)
1222 argv_array_push(argv, "-q");
1226 static int fetch_multiple(struct string_list *list)
1229 struct argv_array argv = ARGV_ARRAY_INIT;
1231 if (!append && !dry_run) {
1232 int errcode = truncate_fetch_head();
1237 argv_array_pushl(&argv, "fetch", "--append", NULL);
1238 add_options_to_argv(&argv);
1240 for (i = 0; i < list->nr; i++) {
1241 const char *name = list->items[i].string;
1242 argv_array_push(&argv, name);
1244 printf(_("Fetching %s\n"), name);
1245 if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
1246 error(_("Could not fetch %s"), name);
1249 argv_array_pop(&argv);
1252 argv_array_clear(&argv);
1256 static int fetch_one(struct remote *remote, int argc, const char **argv)
1258 static const char **refs = NULL;
1259 struct refspec *refspec;
1264 die(_("No remote repository specified. Please, specify either a URL or a\n"
1265 "remote name from which new revisions should be fetched."));
1267 gtransport = prepare_transport(remote, 1);
1270 /* no command line request */
1271 if (0 <= gtransport->remote->prune)
1272 prune = gtransport->remote->prune;
1273 else if (0 <= fetch_prune_config)
1274 prune = fetch_prune_config;
1276 prune = PRUNE_BY_DEFAULT;
1282 refs = xcalloc(st_add(argc, 1), sizeof(const char *));
1283 for (i = 0; i < argc; i++) {
1284 if (!strcmp(argv[i], "tag")) {
1287 die(_("You need to specify a tag name."));
1288 refs[j++] = xstrfmt("refs/tags/%s:refs/tags/%s",
1291 refs[j++] = argv[i];
1297 sigchain_push_common(unlock_pack_on_signal);
1298 atexit(unlock_pack);
1299 refspec = parse_fetch_refspec(ref_nr, refs);
1300 exit_code = do_fetch(gtransport, refspec, ref_nr);
1301 free_refspec(ref_nr, refspec);
1302 transport_disconnect(gtransport);
1307 int cmd_fetch(int argc, const char **argv, const char *prefix)
1310 struct string_list list = STRING_LIST_INIT_DUP;
1311 struct remote *remote;
1313 struct argv_array argv_gc_auto = ARGV_ARRAY_INIT;
1315 packet_trace_identity("fetch");
1317 /* Record the command line for the reflog */
1318 strbuf_addstr(&default_rla, "fetch");
1319 for (i = 1; i < argc; i++)
1320 strbuf_addf(&default_rla, " %s", argv[i]);
1322 git_config(git_fetch_config, NULL);
1324 argc = parse_options(argc, argv, prefix,
1325 builtin_fetch_options, builtin_fetch_usage, 0);
1327 if (deepen_relative) {
1328 if (deepen_relative < 0)
1329 die(_("Negative depth in --deepen is not supported"));
1331 die(_("--deepen and --depth are mutually exclusive"));
1332 depth = xstrfmt("%d", deepen_relative);
1336 die(_("--depth and --unshallow cannot be used together"));
1337 else if (!is_repository_shallow())
1338 die(_("--unshallow on a complete repository does not make sense"));
1340 depth = xstrfmt("%d", INFINITE_DEPTH);
1343 /* no need to be strict, transport_set_option() will validate it again */
1344 if (depth && atoi(depth) < 1)
1345 die(_("depth %s is not a positive number"), depth);
1346 if (depth || deepen_since || deepen_not.nr)
1349 if (recurse_submodules != RECURSE_SUBMODULES_OFF) {
1350 if (recurse_submodules_default) {
1351 int arg = parse_fetch_recurse_submodules_arg("--recurse-submodules-default", recurse_submodules_default);
1352 set_config_fetch_recurse_submodules(arg);
1354 gitmodules_config();
1355 git_config(submodule_config, NULL);
1360 die(_("fetch --all does not take a repository argument"));
1362 die(_("fetch --all does not make sense with refspecs"));
1363 (void) for_each_remote(get_one_remote_for_fetch, &list);
1364 result = fetch_multiple(&list);
1365 } else if (argc == 0) {
1366 /* No arguments -- use default remote */
1367 remote = remote_get(NULL);
1368 result = fetch_one(remote, argc, argv);
1369 } else if (multiple) {
1370 /* All arguments are assumed to be remotes or groups */
1371 for (i = 0; i < argc; i++)
1372 if (!add_remote_or_group(argv[i], &list))
1373 die(_("No such remote or remote group: %s"), argv[i]);
1374 result = fetch_multiple(&list);
1376 /* Single remote or group */
1377 (void) add_remote_or_group(argv[0], &list);
1379 /* More than one remote */
1381 die(_("Fetching a group and specifying refspecs does not make sense"));
1382 result = fetch_multiple(&list);
1384 /* Zero or one remotes */
1385 remote = remote_get(argv[0]);
1386 result = fetch_one(remote, argc-1, argv+1);
1390 if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
1391 struct argv_array options = ARGV_ARRAY_INIT;
1393 add_options_to_argv(&options);
1394 result = fetch_populated_submodules(&options,
1399 argv_array_clear(&options);
1402 string_list_clear(&list, 0);
1406 argv_array_pushl(&argv_gc_auto, "gc", "--auto", NULL);
1408 argv_array_push(&argv_gc_auto, "--quiet");
1409 run_command_v_opt(argv_gc_auto.argv, RUN_GIT_CMD);
1410 argv_array_clear(&argv_gc_auto);