8 #include "string-list.h"
10 #include "transport.h"
11 #include "run-command.h"
12 #include "parse-options.h"
14 #include "transport.h"
16 static const char * const builtin_fetch_usage[] = {
17 "git fetch [options] [<repository> <refspec>...]",
18 "git fetch [options] <group>",
19 "git fetch --multiple [options] [<repository> | <group>]...",
20 "git fetch --all [options]",
30 static int all, append, dry_run, force, keep, multiple, prune, update_head_ok, verbosity;
31 static int tags = TAGS_DEFAULT;
32 static const char *depth;
33 static const char *upload_pack;
34 static struct strbuf default_rla = STRBUF_INIT;
35 static struct transport *transport;
37 static struct option builtin_fetch_options[] = {
38 OPT__VERBOSITY(&verbosity),
39 OPT_BOOLEAN(0, "all", &all,
40 "fetch from all remotes"),
41 OPT_BOOLEAN('a', "append", &append,
42 "append to .git/FETCH_HEAD instead of overwriting"),
43 OPT_STRING(0, "upload-pack", &upload_pack, "PATH",
44 "path to upload pack on remote end"),
45 OPT_BOOLEAN('f', "force", &force,
46 "force overwrite of local branch"),
47 OPT_BOOLEAN('m', "multiple", &multiple,
48 "fetch from multiple remotes"),
49 OPT_SET_INT('t', "tags", &tags,
50 "fetch all tags and associated objects", TAGS_SET),
51 OPT_SET_INT('n', NULL, &tags,
52 "do not fetch all tags (--no-tags)", TAGS_UNSET),
53 OPT_BOOLEAN('p', "prune", &prune,
54 "prune tracking branches no longer on remote"),
55 OPT_BOOLEAN(0, "dry-run", &dry_run,
57 OPT_BOOLEAN('k', "keep", &keep, "keep downloaded pack"),
58 OPT_BOOLEAN('u', "update-head-ok", &update_head_ok,
59 "allow updating of HEAD ref"),
60 OPT_STRING(0, "depth", &depth, "DEPTH",
61 "deepen history of shallow clone"),
65 static void unlock_pack(void)
68 transport_unlock_pack(transport);
71 static void unlock_pack_on_signal(int signo)
78 static void add_merge_config(struct ref **head,
79 const struct ref *remote_refs,
80 struct branch *branch,
85 for (i = 0; i < branch->merge_nr; i++) {
86 struct ref *rm, **old_tail = *tail;
87 struct refspec refspec;
89 for (rm = *head; rm; rm = rm->next) {
90 if (branch_merge_matches(branch, i, rm->name)) {
99 * Not fetched to a tracking branch? We need to fetch
100 * it anyway to allow this branch's "branch.$name.merge"
101 * to be honored by 'git pull', but we do not have to
102 * fail if branch.$name.merge is misconfigured to point
103 * at a nonexisting branch. If we were indeed called by
104 * 'git pull', it will notice the misconfiguration because
105 * there is no entry in the resulting FETCH_HEAD marked
108 refspec.src = branch->merge[i]->src;
112 get_fetch_map(remote_refs, &refspec, tail, 1);
113 for (rm = *old_tail; rm; rm = rm->next)
118 static void find_non_local_tags(struct transport *transport,
122 static struct ref *get_ref_map(struct transport *transport,
123 struct refspec *refs, int ref_count, int tags,
128 struct ref *ref_map = NULL;
129 struct ref **tail = &ref_map;
131 const struct ref *remote_refs = transport_get_remote_refs(transport);
133 if (ref_count || tags == TAGS_SET) {
134 for (i = 0; i < ref_count; i++) {
135 get_fetch_map(remote_refs, &refs[i], &tail, 0);
136 if (refs[i].dst && refs[i].dst[0])
139 /* Merge everything on the command line, but not --tags */
140 for (rm = ref_map; rm; rm = rm->next)
142 if (tags == TAGS_SET)
143 get_fetch_map(remote_refs, tag_refspec, &tail, 0);
145 /* Use the defaults */
146 struct remote *remote = transport->remote;
147 struct branch *branch = branch_get(NULL);
148 int has_merge = branch_has_merge_config(branch);
149 if (remote && (remote->fetch_refspec_nr || has_merge)) {
150 for (i = 0; i < remote->fetch_refspec_nr; i++) {
151 get_fetch_map(remote_refs, &remote->fetch[i], &tail, 0);
152 if (remote->fetch[i].dst &&
153 remote->fetch[i].dst[0])
155 if (!i && !has_merge && ref_map &&
156 !remote->fetch[0].pattern)
160 * if the remote we're fetching from is the same
161 * as given in branch.<name>.remote, we add the
162 * ref given in branch.<name>.merge, too.
165 !strcmp(branch->remote_name, remote->name))
166 add_merge_config(&ref_map, remote_refs, branch, &tail);
168 ref_map = get_remote_ref(remote_refs, "HEAD");
170 die("Couldn't find remote ref HEAD");
172 tail = &ref_map->next;
175 if (tags == TAGS_DEFAULT && *autotags)
176 find_non_local_tags(transport, &ref_map, &tail);
177 ref_remove_duplicates(ref_map);
182 #define STORE_REF_ERROR_OTHER 1
183 #define STORE_REF_ERROR_DF_CONFLICT 2
185 static int s_update_ref(const char *action,
190 char *rla = getenv("GIT_REFLOG_ACTION");
191 static struct ref_lock *lock;
196 rla = default_rla.buf;
197 snprintf(msg, sizeof(msg), "%s: %s", rla, action);
198 lock = lock_any_ref_for_update(ref->name,
199 check_old ? ref->old_sha1 : NULL, 0);
201 return errno == ENOTDIR ? STORE_REF_ERROR_DF_CONFLICT :
202 STORE_REF_ERROR_OTHER;
203 if (write_ref_sha1(lock, ref->new_sha1, msg) < 0)
204 return errno == ENOTDIR ? STORE_REF_ERROR_DF_CONFLICT :
205 STORE_REF_ERROR_OTHER;
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", TRANSPORT_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 TRANSPORT_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 TRANSPORT_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 TRANSPORT_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 TRANSPORT_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 TRANSPORT_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 TRANSPORT_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 TRANSPORT_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 TRANSPORT_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 truncate_fetch_head(void)
656 char *filename = git_path("FETCH_HEAD");
657 FILE *fp = fopen(filename, "w");
660 return error("cannot open %s: %s\n", filename, strerror(errno));
665 static int do_fetch(struct transport *transport,
666 struct refspec *refs, int ref_count)
668 struct string_list existing_refs = { NULL, 0, 0, 0 };
669 struct string_list_item *peer_item = NULL;
672 int autotags = (transport->remote->fetch_tags == 1);
674 for_each_ref(add_existing, &existing_refs);
676 if (transport->remote->fetch_tags == 2 && tags != TAGS_UNSET)
678 if (transport->remote->fetch_tags == -1)
681 if (!transport->get_refs_list || !transport->fetch)
682 die("Don't know how to fetch from %s", transport->url);
684 /* if not appending, truncate FETCH_HEAD */
685 if (!append && !dry_run) {
686 int errcode = truncate_fetch_head();
691 ref_map = get_ref_map(transport, refs, ref_count, tags, &autotags);
693 check_not_current_branch(ref_map);
695 for (rm = ref_map; rm; rm = rm->next) {
697 peer_item = string_list_lookup(rm->peer_ref->name,
700 hashcpy(rm->peer_ref->old_sha1,
705 if (tags == TAGS_DEFAULT && autotags)
706 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
707 if (fetch_refs(transport, ref_map)) {
712 prune_refs(transport, ref_map);
715 /* if neither --no-tags nor --tags was specified, do automated tag
717 if (tags == TAGS_DEFAULT && autotags) {
718 struct ref **tail = &ref_map;
720 find_non_local_tags(transport, &ref_map, &tail);
722 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
723 transport_set_option(transport, TRANS_OPT_DEPTH, "0");
724 fetch_refs(transport, ref_map);
732 static void set_option(const char *name, const char *value)
734 int r = transport_set_option(transport, name, value);
736 die("Option \"%s\" value \"%s\" is not valid for %s",
737 name, value, transport->url);
739 warning("Option \"%s\" is ignored for %s\n",
740 name, transport->url);
743 static int get_one_remote_for_fetch(struct remote *remote, void *priv)
745 struct string_list *list = priv;
746 if (!remote->skip_default_update)
747 string_list_append(remote->name, list);
751 struct remote_group_data {
753 struct string_list *list;
756 static int get_remote_group(const char *key, const char *value, void *priv)
758 struct remote_group_data *g = priv;
760 if (!prefixcmp(key, "remotes.") &&
761 !strcmp(key + 8, g->name)) {
762 /* split list by white space */
763 int space = strcspn(value, " \t\n");
766 string_list_append(xstrndup(value, space),
769 value += space + (value[space] != '\0');
770 space = strcspn(value, " \t\n");
777 static int add_remote_or_group(const char *name, struct string_list *list)
779 int prev_nr = list->nr;
780 struct remote_group_data g = { name, list };
782 git_config(get_remote_group, &g);
783 if (list->nr == prev_nr) {
784 struct remote *remote;
785 if (!remote_is_configured(name))
787 remote = remote_get(name);
788 string_list_append(remote->name, list);
793 static int fetch_multiple(struct string_list *list)
796 const char *argv[11] = { "fetch", "--append" };
800 argv[argc++] = "--dry-run";
802 argv[argc++] = "--prune";
804 argv[argc++] = "--update-head-ok";
806 argv[argc++] = "--force";
808 argv[argc++] = "--keep";
813 else if (verbosity < 0)
816 if (!append && !dry_run) {
817 int errcode = truncate_fetch_head();
822 for (i = 0; i < list->nr; i++) {
823 const char *name = list->items[i].string;
825 argv[argc + 1] = NULL;
827 printf("Fetching %s\n", name);
828 if (run_command_v_opt(argv, RUN_GIT_CMD)) {
829 error("Could not fetch %s", name);
837 static int fetch_one(struct remote *remote, int argc, const char **argv)
840 static const char **refs = NULL;
845 die("Where do you want to fetch from today?");
847 transport = transport_get(remote, NULL);
849 transport->verbose = verbosity <= 3 ? verbosity : 3;
851 transport->verbose = -1;
853 set_option(TRANS_OPT_UPLOADPACK, upload_pack);
855 set_option(TRANS_OPT_KEEP, "yes");
857 set_option(TRANS_OPT_DEPTH, depth);
861 refs = xcalloc(argc + 1, sizeof(const char *));
862 for (i = 0; i < argc; i++) {
863 if (!strcmp(argv[i], "tag")) {
867 die("You need to specify a tag name.");
868 ref = xmalloc(strlen(argv[i]) * 2 + 22);
869 strcpy(ref, "refs/tags/");
870 strcat(ref, argv[i]);
871 strcat(ref, ":refs/tags/");
872 strcat(ref, argv[i]);
881 sigchain_push_common(unlock_pack_on_signal);
883 exit_code = do_fetch(transport,
884 parse_fetch_refspec(ref_nr, refs), ref_nr);
885 transport_disconnect(transport);
890 int cmd_fetch(int argc, const char **argv, const char *prefix)
893 struct string_list list = { NULL, 0, 0, 0 };
894 struct remote *remote;
897 /* Record the command line for the reflog */
898 strbuf_addstr(&default_rla, "fetch");
899 for (i = 1; i < argc; i++)
900 strbuf_addf(&default_rla, " %s", argv[i]);
902 argc = parse_options(argc, argv, prefix,
903 builtin_fetch_options, builtin_fetch_usage, 0);
907 die("fetch --all does not take a repository argument");
909 die("fetch --all does not make sense with refspecs");
910 (void) for_each_remote(get_one_remote_for_fetch, &list);
911 result = fetch_multiple(&list);
912 } else if (argc == 0) {
913 /* No arguments -- use default remote */
914 remote = remote_get(NULL);
915 result = fetch_one(remote, argc, argv);
916 } else if (multiple) {
917 /* All arguments are assumed to be remotes or groups */
918 for (i = 0; i < argc; i++)
919 if (!add_remote_or_group(argv[i], &list))
920 die("No such remote or remote group: %s", argv[i]);
921 result = fetch_multiple(&list);
923 /* Single remote or group */
924 (void) add_remote_or_group(argv[0], &list);
926 /* More than one remote */
928 die("Fetching a group and specifying refspecs does not make sense");
929 result = fetch_multiple(&list);
931 /* Zero or one remotes */
932 remote = remote_get(argv[0]);
933 result = fetch_one(remote, argc-1, argv+1);
937 /* All names were strdup()ed or strndup()ed */
938 list.strdup_strings = 1;
939 string_list_clear(&list, 0);