8 #include "string-list.h"
10 #include "transport.h"
11 #include "run-command.h"
12 #include "parse-options.h"
15 static const char * const builtin_fetch_usage[] = {
16 "git fetch [options] [<repository> <refspec>...]",
17 "git fetch [options] <group>",
18 "git fetch --multiple [options] [<repository> | <group>]...",
19 "git fetch --all [options]",
29 static int all, append, dry_run, force, keep, multiple, prune, update_head_ok, verbosity;
30 static int tags = TAGS_DEFAULT;
31 static const char *depth;
32 static const char *upload_pack;
33 static struct strbuf default_rla = STRBUF_INIT;
34 static struct transport *transport;
36 static struct option builtin_fetch_options[] = {
37 OPT__VERBOSITY(&verbosity),
38 OPT_BOOLEAN(0, "all", &all,
39 "fetch from all remotes"),
40 OPT_BOOLEAN('a', "append", &append,
41 "append to .git/FETCH_HEAD instead of overwriting"),
42 OPT_STRING(0, "upload-pack", &upload_pack, "PATH",
43 "path to upload pack on remote end"),
44 OPT_BOOLEAN('f', "force", &force,
45 "force overwrite of local branch"),
46 OPT_BOOLEAN('m', "multiple", &multiple,
47 "fetch from multiple remotes"),
48 OPT_SET_INT('t', "tags", &tags,
49 "fetch all tags and associated objects", TAGS_SET),
50 OPT_SET_INT('n', NULL, &tags,
51 "do not fetch all tags (--no-tags)", TAGS_UNSET),
52 OPT_BOOLEAN('p', "prune", &prune,
53 "prune tracking branches no longer on remote"),
54 OPT_BOOLEAN(0, "dry-run", &dry_run,
56 OPT_BOOLEAN('k', "keep", &keep, "keep downloaded pack"),
57 OPT_BOOLEAN('u', "update-head-ok", &update_head_ok,
58 "allow updating of HEAD ref"),
59 OPT_STRING(0, "depth", &depth, "DEPTH",
60 "deepen history of shallow clone"),
64 static void unlock_pack(void)
67 transport_unlock_pack(transport);
70 static void unlock_pack_on_signal(int signo)
77 static void add_merge_config(struct ref **head,
78 const struct ref *remote_refs,
79 struct branch *branch,
84 for (i = 0; i < branch->merge_nr; i++) {
85 struct ref *rm, **old_tail = *tail;
86 struct refspec refspec;
88 for (rm = *head; rm; rm = rm->next) {
89 if (branch_merge_matches(branch, i, rm->name)) {
98 * Not fetched to a tracking branch? We need to fetch
99 * it anyway to allow this branch's "branch.$name.merge"
100 * to be honored by 'git pull', but we do not have to
101 * fail if branch.$name.merge is misconfigured to point
102 * at a nonexisting branch. If we were indeed called by
103 * 'git pull', it will notice the misconfiguration because
104 * there is no entry in the resulting FETCH_HEAD marked
107 refspec.src = branch->merge[i]->src;
111 get_fetch_map(remote_refs, &refspec, tail, 1);
112 for (rm = *old_tail; rm; rm = rm->next)
117 static void find_non_local_tags(struct transport *transport,
121 static struct ref *get_ref_map(struct transport *transport,
122 struct refspec *refs, int ref_count, int tags,
127 struct ref *ref_map = NULL;
128 struct ref **tail = &ref_map;
130 const struct ref *remote_refs = transport_get_remote_refs(transport);
132 if (ref_count || tags == TAGS_SET) {
133 for (i = 0; i < ref_count; i++) {
134 get_fetch_map(remote_refs, &refs[i], &tail, 0);
135 if (refs[i].dst && refs[i].dst[0])
138 /* Merge everything on the command line, but not --tags */
139 for (rm = ref_map; rm; rm = rm->next)
141 if (tags == TAGS_SET)
142 get_fetch_map(remote_refs, tag_refspec, &tail, 0);
144 /* Use the defaults */
145 struct remote *remote = transport->remote;
146 struct branch *branch = branch_get(NULL);
147 int has_merge = branch_has_merge_config(branch);
148 if (remote && (remote->fetch_refspec_nr || has_merge)) {
149 for (i = 0; i < remote->fetch_refspec_nr; i++) {
150 get_fetch_map(remote_refs, &remote->fetch[i], &tail, 0);
151 if (remote->fetch[i].dst &&
152 remote->fetch[i].dst[0])
154 if (!i && !has_merge && ref_map &&
155 !remote->fetch[0].pattern)
159 * if the remote we're fetching from is the same
160 * as given in branch.<name>.remote, we add the
161 * ref given in branch.<name>.merge, too.
164 !strcmp(branch->remote_name, remote->name))
165 add_merge_config(&ref_map, remote_refs, branch, &tail);
167 ref_map = get_remote_ref(remote_refs, "HEAD");
169 die("Couldn't find remote ref HEAD");
171 tail = &ref_map->next;
174 if (tags == TAGS_DEFAULT && *autotags)
175 find_non_local_tags(transport, &ref_map, &tail);
176 ref_remove_duplicates(ref_map);
181 #define STORE_REF_ERROR_OTHER 1
182 #define STORE_REF_ERROR_DF_CONFLICT 2
184 static int s_update_ref(const char *action,
189 char *rla = getenv("GIT_REFLOG_ACTION");
190 static struct ref_lock *lock;
195 rla = default_rla.buf;
196 snprintf(msg, sizeof(msg), "%s: %s", rla, action);
197 lock = lock_any_ref_for_update(ref->name,
198 check_old ? ref->old_sha1 : NULL, 0);
200 return errno == ENOTDIR ? STORE_REF_ERROR_DF_CONFLICT :
201 STORE_REF_ERROR_OTHER;
202 if (write_ref_sha1(lock, ref->new_sha1, msg) < 0)
203 return errno == ENOTDIR ? STORE_REF_ERROR_DF_CONFLICT :
204 STORE_REF_ERROR_OTHER;
208 #define SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3)
209 #define REFCOL_WIDTH 10
211 static int update_local_ref(struct ref *ref,
215 struct commit *current = NULL, *updated;
216 enum object_type type;
217 struct branch *current_branch = branch_get(NULL);
218 const char *pretty_ref = prettify_refname(ref->name);
221 type = sha1_object_info(ref->new_sha1, NULL);
223 die("object %s not found", sha1_to_hex(ref->new_sha1));
225 if (!hashcmp(ref->old_sha1, ref->new_sha1)) {
227 sprintf(display, "= %-*s %-*s -> %s", SUMMARY_WIDTH,
228 "[up to date]", REFCOL_WIDTH, remote,
233 if (current_branch &&
234 !strcmp(ref->name, current_branch->name) &&
235 !(update_head_ok || is_bare_repository()) &&
236 !is_null_sha1(ref->old_sha1)) {
238 * If this is the head, and it's not okay to update
239 * the head, and the old value of the head isn't empty...
241 sprintf(display, "! %-*s %-*s -> %s (can't fetch in current branch)",
242 SUMMARY_WIDTH, "[rejected]", REFCOL_WIDTH, remote,
247 if (!is_null_sha1(ref->old_sha1) &&
248 !prefixcmp(ref->name, "refs/tags/")) {
250 r = s_update_ref("updating tag", ref, 0);
251 sprintf(display, "%c %-*s %-*s -> %s%s", r ? '!' : '-',
252 SUMMARY_WIDTH, "[tag update]", REFCOL_WIDTH, remote,
253 pretty_ref, r ? " (unable to update local ref)" : "");
257 current = lookup_commit_reference_gently(ref->old_sha1, 1);
258 updated = lookup_commit_reference_gently(ref->new_sha1, 1);
259 if (!current || !updated) {
263 if (!strncmp(ref->name, "refs/tags/", 10)) {
268 msg = "storing head";
269 what = "[new branch]";
272 r = s_update_ref(msg, ref, 0);
273 sprintf(display, "%c %-*s %-*s -> %s%s", r ? '!' : '*',
274 SUMMARY_WIDTH, what, REFCOL_WIDTH, remote, pretty_ref,
275 r ? " (unable to update local ref)" : "");
279 if (in_merge_bases(current, &updated, 1)) {
282 strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV));
283 strcat(quickref, "..");
284 strcat(quickref, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV));
285 r = s_update_ref("fast-forward", ref, 1);
286 sprintf(display, "%c %-*s %-*s -> %s%s", r ? '!' : ' ',
287 SUMMARY_WIDTH, quickref, REFCOL_WIDTH, remote,
288 pretty_ref, r ? " (unable to update local ref)" : "");
290 } else if (force || ref->force) {
293 strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV));
294 strcat(quickref, "...");
295 strcat(quickref, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV));
296 r = s_update_ref("forced-update", ref, 1);
297 sprintf(display, "%c %-*s %-*s -> %s (%s)", r ? '!' : '+',
298 SUMMARY_WIDTH, quickref, REFCOL_WIDTH, remote,
300 r ? "unable to update local ref" : "forced update");
303 sprintf(display, "! %-*s %-*s -> %s (non-fast-forward)",
304 SUMMARY_WIDTH, "[rejected]", REFCOL_WIDTH, remote,
310 static int store_updated_refs(const char *raw_url, const char *remote_name,
314 struct commit *commit;
315 int url_len, i, note_len, shown_url = 0, rc = 0;
317 const char *what, *kind;
319 char *url, *filename = dry_run ? "/dev/null" : git_path("FETCH_HEAD");
321 fp = fopen(filename, "a");
323 return error("cannot open %s: %s\n", filename, strerror(errno));
326 url = transport_anonymize_url(raw_url);
328 url = xstrdup("foreign");
329 for (rm = ref_map; rm; rm = rm->next) {
330 struct ref *ref = NULL;
333 ref = xcalloc(1, sizeof(*ref) + strlen(rm->peer_ref->name) + 1);
334 strcpy(ref->name, rm->peer_ref->name);
335 hashcpy(ref->old_sha1, rm->peer_ref->old_sha1);
336 hashcpy(ref->new_sha1, rm->old_sha1);
337 ref->force = rm->peer_ref->force;
340 commit = lookup_commit_reference_gently(rm->old_sha1, 1);
344 if (!strcmp(rm->name, "HEAD")) {
348 else if (!prefixcmp(rm->name, "refs/heads/")) {
350 what = rm->name + 11;
352 else if (!prefixcmp(rm->name, "refs/tags/")) {
354 what = rm->name + 10;
356 else if (!prefixcmp(rm->name, "refs/remotes/")) {
357 kind = "remote branch";
358 what = rm->name + 13;
365 url_len = strlen(url);
366 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
369 if (4 < i && !strncmp(".git", url + i - 3, 4))
375 note_len += sprintf(note + note_len, "%s ",
377 note_len += sprintf(note + note_len, "'%s' of ", what);
379 note[note_len] = '\0';
380 fprintf(fp, "%s\t%s\t%s",
381 sha1_to_hex(commit ? commit->object.sha1 :
383 rm->merge ? "" : "not-for-merge",
385 for (i = 0; i < url_len; ++i)
393 rc |= update_local_ref(ref, what, note);
395 sprintf(note, "* %-*s %-*s -> FETCH_HEAD",
396 SUMMARY_WIDTH, *kind ? kind : "branch",
397 REFCOL_WIDTH, *what ? what : "HEAD");
399 if (verbosity >= 0 && !shown_url) {
400 fprintf(stderr, "From %.*s\n",
405 fprintf(stderr, " %s\n", note);
410 if (rc & STORE_REF_ERROR_DF_CONFLICT)
411 error("some local refs could not be updated; try running\n"
412 " 'git remote prune %s' to remove any old, conflicting "
413 "branches", remote_name);
418 * We would want to bypass the object transfer altogether if
419 * everything we are going to fetch already exists and is connected
422 * The refs we are going to fetch are in ref_map. If running
424 * $ git rev-list --objects --stdin --not --all
426 * (feeding all the refs in ref_map on its standard input)
427 * does not error out, that means everything reachable from the
428 * refs we are going to fetch exists and is connected to some of
431 static int quickfetch(struct ref *ref_map)
433 struct child_process revlist;
436 const char *argv[] = {"rev-list",
437 "--quiet", "--objects", "--stdin", "--not", "--all", NULL};
440 * If we are deepening a shallow clone we already have these
441 * objects reachable. Running rev-list here will return with
442 * a good (0) exit status and we'll bypass the fetch that we
443 * really need to perform. Claiming failure now will ensure
444 * we perform the network exchange to deepen our history.
452 memset(&revlist, 0, sizeof(revlist));
455 revlist.no_stdout = 1;
456 revlist.no_stderr = 1;
459 err = start_command(&revlist);
461 error("could not run rev-list");
466 * If rev-list --stdin encounters an unknown commit, it terminates,
467 * which will cause SIGPIPE in the write loop below.
469 sigchain_push(SIGPIPE, SIG_IGN);
471 for (ref = ref_map; ref; ref = ref->next) {
472 if (write_in_full(revlist.in, sha1_to_hex(ref->old_sha1), 40) < 0 ||
473 write_str_in_full(revlist.in, "\n") < 0) {
474 if (errno != EPIPE && errno != EINVAL)
475 error("failed write to rev-list: %s", strerror(errno));
481 if (close(revlist.in)) {
482 error("failed to close rev-list's stdin: %s", strerror(errno));
486 sigchain_pop(SIGPIPE);
488 return finish_command(&revlist) || err;
491 static int fetch_refs(struct transport *transport, struct ref *ref_map)
493 int ret = quickfetch(ref_map);
495 ret = transport_fetch_refs(transport, ref_map);
497 ret |= store_updated_refs(transport->url,
498 transport->remote->name,
500 transport_unlock_pack(transport);
504 static int prune_refs(struct transport *transport, struct ref *ref_map)
507 struct ref *ref, *stale_refs = get_stale_heads(transport->remote, ref_map);
508 const char *dangling_msg = dry_run
509 ? " (%s will become dangling)\n"
510 : " (%s has become dangling)\n";
512 for (ref = stale_refs; ref; ref = ref->next) {
514 result |= delete_ref(ref->name, NULL, 0);
515 if (verbosity >= 0) {
516 fprintf(stderr, " x %-*s %-*s -> %s\n",
517 SUMMARY_WIDTH, "[deleted]",
518 REFCOL_WIDTH, "(none)", prettify_refname(ref->name));
519 warn_dangling_symref(stderr, dangling_msg, ref->name);
522 free_refs(stale_refs);
526 static int add_existing(const char *refname, const unsigned char *sha1,
527 int flag, void *cbdata)
529 struct string_list *list = (struct string_list *)cbdata;
530 struct string_list_item *item = string_list_insert(refname, list);
531 item->util = (void *)sha1;
535 static int will_fetch(struct ref **head, const unsigned char *sha1)
537 struct ref *rm = *head;
539 if (!hashcmp(rm->old_sha1, sha1))
551 static int add_to_tail(struct string_list_item *item, void *cb_data)
553 struct tag_data *data = (struct tag_data *)cb_data;
554 struct ref *rm = NULL;
556 /* We have already decided to ignore this item */
560 rm = alloc_ref(item->string);
561 rm->peer_ref = alloc_ref(item->string);
562 hashcpy(rm->old_sha1, item->util);
565 *data->tail = &rm->next;
570 static void find_non_local_tags(struct transport *transport,
574 struct string_list existing_refs = { NULL, 0, 0, 0 };
575 struct string_list remote_refs = { NULL, 0, 0, 0 };
576 struct tag_data data = {head, tail};
577 const struct ref *ref;
578 struct string_list_item *item = NULL;
580 for_each_ref(add_existing, &existing_refs);
581 for (ref = transport_get_remote_refs(transport); ref; ref = ref->next) {
582 if (prefixcmp(ref->name, "refs/tags"))
586 * The peeled ref always follows the matching base
587 * ref, so if we see a peeled ref that we don't want
588 * to fetch then we can mark the ref entry in the list
589 * as one to ignore by setting util to NULL.
591 if (!strcmp(ref->name + strlen(ref->name) - 3, "^{}")) {
592 if (item && !has_sha1_file(ref->old_sha1) &&
593 !will_fetch(head, ref->old_sha1) &&
594 !has_sha1_file(item->util) &&
595 !will_fetch(head, item->util))
602 * If item is non-NULL here, then we previously saw a
603 * ref not followed by a peeled reference, so we need
604 * to check if it is a lightweight tag that we want to
607 if (item && !has_sha1_file(item->util) &&
608 !will_fetch(head, item->util))
613 /* skip duplicates and refs that we already have */
614 if (string_list_has_string(&remote_refs, ref->name) ||
615 string_list_has_string(&existing_refs, ref->name))
618 item = string_list_insert(ref->name, &remote_refs);
619 item->util = (void *)ref->old_sha1;
621 string_list_clear(&existing_refs, 0);
624 * We may have a final lightweight tag that needs to be
625 * checked to see if it needs fetching.
627 if (item && !has_sha1_file(item->util) &&
628 !will_fetch(head, item->util))
632 * For all the tags in the remote_refs string list, call
633 * add_to_tail to add them to the list of refs to be fetched
635 for_each_string_list(add_to_tail, &remote_refs, &data);
637 string_list_clear(&remote_refs, 0);
640 static void check_not_current_branch(struct ref *ref_map)
642 struct branch *current_branch = branch_get(NULL);
644 if (is_bare_repository() || !current_branch)
647 for (; ref_map; ref_map = ref_map->next)
648 if (ref_map->peer_ref && !strcmp(current_branch->refname,
649 ref_map->peer_ref->name))
650 die("Refusing to fetch into current branch %s "
651 "of non-bare repository", current_branch->refname);
654 static int do_fetch(struct transport *transport,
655 struct refspec *refs, int ref_count)
657 struct string_list existing_refs = { NULL, 0, 0, 0 };
658 struct string_list_item *peer_item = NULL;
661 int autotags = (transport->remote->fetch_tags == 1);
663 for_each_ref(add_existing, &existing_refs);
665 if (transport->remote->fetch_tags == 2 && tags != TAGS_UNSET)
667 if (transport->remote->fetch_tags == -1)
670 if (!transport->get_refs_list || !transport->fetch)
671 die("Don't know how to fetch from %s", transport->url);
673 /* if not appending, truncate FETCH_HEAD */
674 if (!append && !dry_run) {
675 char *filename = git_path("FETCH_HEAD");
676 FILE *fp = fopen(filename, "w");
678 return error("cannot open %s: %s\n", filename, strerror(errno));
682 ref_map = get_ref_map(transport, refs, ref_count, tags, &autotags);
684 check_not_current_branch(ref_map);
686 for (rm = ref_map; rm; rm = rm->next) {
688 peer_item = string_list_lookup(rm->peer_ref->name,
691 hashcpy(rm->peer_ref->old_sha1,
696 if (tags == TAGS_DEFAULT && autotags)
697 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
698 if (fetch_refs(transport, ref_map)) {
703 prune_refs(transport, ref_map);
706 /* if neither --no-tags nor --tags was specified, do automated tag
708 if (tags == TAGS_DEFAULT && autotags) {
709 struct ref **tail = &ref_map;
711 find_non_local_tags(transport, &ref_map, &tail);
713 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
714 transport_set_option(transport, TRANS_OPT_DEPTH, "0");
715 fetch_refs(transport, ref_map);
723 static void set_option(const char *name, const char *value)
725 int r = transport_set_option(transport, name, value);
727 die("Option \"%s\" value \"%s\" is not valid for %s",
728 name, value, transport->url);
730 warning("Option \"%s\" is ignored for %s\n",
731 name, transport->url);
734 static int get_one_remote_for_fetch(struct remote *remote, void *priv)
736 struct string_list *list = priv;
737 if (!remote->skip_default_update)
738 string_list_append(remote->name, list);
742 struct remote_group_data {
744 struct string_list *list;
747 static int get_remote_group(const char *key, const char *value, void *priv)
749 struct remote_group_data *g = priv;
751 if (!prefixcmp(key, "remotes.") &&
752 !strcmp(key + 8, g->name)) {
753 /* split list by white space */
754 int space = strcspn(value, " \t\n");
757 string_list_append(xstrndup(value, space),
760 value += space + (value[space] != '\0');
761 space = strcspn(value, " \t\n");
768 static int add_remote_or_group(const char *name, struct string_list *list)
770 int prev_nr = list->nr;
771 struct remote_group_data g = { name, list };
773 git_config(get_remote_group, &g);
774 if (list->nr == prev_nr) {
775 struct remote *remote;
776 if (!remote_is_configured(name))
778 remote = remote_get(name);
779 string_list_append(remote->name, list);
784 static int fetch_multiple(struct string_list *list)
787 const char *argv[] = { "fetch", NULL, NULL, NULL, NULL, NULL, NULL };
791 argv[argc++] = "--dry-run";
793 argv[argc++] = "--prune";
798 else if (verbosity < 0)
801 for (i = 0; i < list->nr; i++) {
802 const char *name = list->items[i].string;
805 printf("Fetching %s\n", name);
806 if (run_command_v_opt(argv, RUN_GIT_CMD)) {
807 error("Could not fetch %s", name);
815 static int fetch_one(struct remote *remote, int argc, const char **argv)
818 static const char **refs = NULL;
823 die("Where do you want to fetch from today?");
825 transport = transport_get(remote, NULL);
827 transport->verbose = verbosity <= 3 ? verbosity : 3;
829 transport->verbose = -1;
831 set_option(TRANS_OPT_UPLOADPACK, upload_pack);
833 set_option(TRANS_OPT_KEEP, "yes");
835 set_option(TRANS_OPT_DEPTH, depth);
839 refs = xcalloc(argc + 1, sizeof(const char *));
840 for (i = 0; i < argc; i++) {
841 if (!strcmp(argv[i], "tag")) {
845 die("You need to specify a tag name.");
846 ref = xmalloc(strlen(argv[i]) * 2 + 22);
847 strcpy(ref, "refs/tags/");
848 strcat(ref, argv[i]);
849 strcat(ref, ":refs/tags/");
850 strcat(ref, argv[i]);
859 sigchain_push_common(unlock_pack_on_signal);
861 exit_code = do_fetch(transport,
862 parse_fetch_refspec(ref_nr, refs), ref_nr);
863 transport_disconnect(transport);
868 int cmd_fetch(int argc, const char **argv, const char *prefix)
871 struct string_list list = { NULL, 0, 0, 0 };
872 struct remote *remote;
875 /* Record the command line for the reflog */
876 strbuf_addstr(&default_rla, "fetch");
877 for (i = 1; i < argc; i++)
878 strbuf_addf(&default_rla, " %s", argv[i]);
880 argc = parse_options(argc, argv, prefix,
881 builtin_fetch_options, builtin_fetch_usage, 0);
885 die("fetch --all does not take a repository argument");
887 die("fetch --all does not make sense with refspecs");
888 (void) for_each_remote(get_one_remote_for_fetch, &list);
889 result = fetch_multiple(&list);
890 } else if (argc == 0) {
891 /* No arguments -- use default remote */
892 remote = remote_get(NULL);
893 result = fetch_one(remote, argc, argv);
894 } else if (multiple) {
895 /* All arguments are assumed to be remotes or groups */
896 for (i = 0; i < argc; i++)
897 if (!add_remote_or_group(argv[i], &list))
898 die("No such remote or remote group: %s", argv[i]);
899 result = fetch_multiple(&list);
901 /* Single remote or group */
902 (void) add_remote_or_group(argv[0], &list);
904 /* More than one remote */
906 die("Fetching a group and specifying refspecs does not make sense");
907 result = fetch_multiple(&list);
909 /* Zero or one remotes */
910 remote = remote_get(argv[0]);
911 result = fetch_one(remote, argc-1, argv+1);
915 /* All names were strdup()ed or strndup()ed */
916 list.strdup_strings = 1;
917 string_list_clear(&list, 0);