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;
32 static int tags = TAGS_DEFAULT;
33 static const char *depth;
34 static const char *upload_pack;
35 static struct strbuf default_rla = STRBUF_INIT;
36 static struct transport *transport;
38 static struct option builtin_fetch_options[] = {
39 OPT__VERBOSITY(&verbosity),
40 OPT_BOOLEAN(0, "all", &all,
41 "fetch from all remotes"),
42 OPT_BOOLEAN('a', "append", &append,
43 "append to .git/FETCH_HEAD instead of overwriting"),
44 OPT_STRING(0, "upload-pack", &upload_pack, "PATH",
45 "path to upload pack on remote end"),
46 OPT_BOOLEAN('f', "force", &force,
47 "force overwrite of local branch"),
48 OPT_BOOLEAN('m', "multiple", &multiple,
49 "fetch from multiple remotes"),
50 OPT_SET_INT('t', "tags", &tags,
51 "fetch all tags and associated objects", TAGS_SET),
52 OPT_SET_INT('n', NULL, &tags,
53 "do not fetch all tags (--no-tags)", TAGS_UNSET),
54 OPT_BOOLEAN('p', "prune", &prune,
55 "prune tracking branches no longer on remote"),
56 OPT_BOOLEAN(0, "dry-run", &dry_run,
58 OPT_BOOLEAN('k', "keep", &keep, "keep downloaded pack"),
59 OPT_BOOLEAN('u', "update-head-ok", &update_head_ok,
60 "allow updating of HEAD ref"),
61 OPT_BOOLEAN(0, "progress", &progress, "force progress reporting"),
62 OPT_STRING(0, "depth", &depth, "DEPTH",
63 "deepen history of shallow clone"),
67 static void unlock_pack(void)
70 transport_unlock_pack(transport);
73 static void unlock_pack_on_signal(int signo)
80 static void add_merge_config(struct ref **head,
81 const struct ref *remote_refs,
82 struct branch *branch,
87 for (i = 0; i < branch->merge_nr; i++) {
88 struct ref *rm, **old_tail = *tail;
89 struct refspec refspec;
91 for (rm = *head; rm; rm = rm->next) {
92 if (branch_merge_matches(branch, i, rm->name)) {
101 * Not fetched to a tracking branch? We need to fetch
102 * it anyway to allow this branch's "branch.$name.merge"
103 * to be honored by 'git pull', but we do not have to
104 * fail if branch.$name.merge is misconfigured to point
105 * at a nonexisting branch. If we were indeed called by
106 * 'git pull', it will notice the misconfiguration because
107 * there is no entry in the resulting FETCH_HEAD marked
110 refspec.src = branch->merge[i]->src;
114 get_fetch_map(remote_refs, &refspec, tail, 1);
115 for (rm = *old_tail; rm; rm = rm->next)
120 static void find_non_local_tags(struct transport *transport,
124 static struct ref *get_ref_map(struct transport *transport,
125 struct refspec *refs, int ref_count, int tags,
130 struct ref *ref_map = NULL;
131 struct ref **tail = &ref_map;
133 const struct ref *remote_refs = transport_get_remote_refs(transport);
135 if (ref_count || tags == TAGS_SET) {
136 for (i = 0; i < ref_count; i++) {
137 get_fetch_map(remote_refs, &refs[i], &tail, 0);
138 if (refs[i].dst && refs[i].dst[0])
141 /* Merge everything on the command line, but not --tags */
142 for (rm = ref_map; rm; rm = rm->next)
144 if (tags == TAGS_SET)
145 get_fetch_map(remote_refs, tag_refspec, &tail, 0);
147 /* Use the defaults */
148 struct remote *remote = transport->remote;
149 struct branch *branch = branch_get(NULL);
150 int has_merge = branch_has_merge_config(branch);
151 if (remote && (remote->fetch_refspec_nr || has_merge)) {
152 for (i = 0; i < remote->fetch_refspec_nr; i++) {
153 get_fetch_map(remote_refs, &remote->fetch[i], &tail, 0);
154 if (remote->fetch[i].dst &&
155 remote->fetch[i].dst[0])
157 if (!i && !has_merge && ref_map &&
158 !remote->fetch[0].pattern)
162 * if the remote we're fetching from is the same
163 * as given in branch.<name>.remote, we add the
164 * ref given in branch.<name>.merge, too.
167 !strcmp(branch->remote_name, remote->name))
168 add_merge_config(&ref_map, remote_refs, branch, &tail);
170 ref_map = get_remote_ref(remote_refs, "HEAD");
172 die("Couldn't find remote ref HEAD");
174 tail = &ref_map->next;
177 if (tags == TAGS_DEFAULT && *autotags)
178 find_non_local_tags(transport, &ref_map, &tail);
179 ref_remove_duplicates(ref_map);
184 #define STORE_REF_ERROR_OTHER 1
185 #define STORE_REF_ERROR_DF_CONFLICT 2
187 static int s_update_ref(const char *action,
192 char *rla = getenv("GIT_REFLOG_ACTION");
193 static struct ref_lock *lock;
198 rla = default_rla.buf;
199 snprintf(msg, sizeof(msg), "%s: %s", rla, action);
200 lock = lock_any_ref_for_update(ref->name,
201 check_old ? ref->old_sha1 : NULL, 0);
203 return errno == ENOTDIR ? STORE_REF_ERROR_DF_CONFLICT :
204 STORE_REF_ERROR_OTHER;
205 if (write_ref_sha1(lock, ref->new_sha1, msg) < 0)
206 return errno == ENOTDIR ? STORE_REF_ERROR_DF_CONFLICT :
207 STORE_REF_ERROR_OTHER;
211 #define REFCOL_WIDTH 10
213 static int update_local_ref(struct ref *ref,
217 struct commit *current = NULL, *updated;
218 enum object_type type;
219 struct branch *current_branch = branch_get(NULL);
220 const char *pretty_ref = prettify_refname(ref->name);
223 type = sha1_object_info(ref->new_sha1, NULL);
225 die("object %s not found", sha1_to_hex(ref->new_sha1));
227 if (!hashcmp(ref->old_sha1, ref->new_sha1)) {
229 sprintf(display, "= %-*s %-*s -> %s", TRANSPORT_SUMMARY_WIDTH,
230 "[up to date]", REFCOL_WIDTH, remote,
235 if (current_branch &&
236 !strcmp(ref->name, current_branch->name) &&
237 !(update_head_ok || is_bare_repository()) &&
238 !is_null_sha1(ref->old_sha1)) {
240 * If this is the head, and it's not okay to update
241 * the head, and the old value of the head isn't empty...
243 sprintf(display, "! %-*s %-*s -> %s (can't fetch in current branch)",
244 TRANSPORT_SUMMARY_WIDTH, "[rejected]", REFCOL_WIDTH, remote,
249 if (!is_null_sha1(ref->old_sha1) &&
250 !prefixcmp(ref->name, "refs/tags/")) {
252 r = s_update_ref("updating tag", ref, 0);
253 sprintf(display, "%c %-*s %-*s -> %s%s", r ? '!' : '-',
254 TRANSPORT_SUMMARY_WIDTH, "[tag update]", REFCOL_WIDTH, remote,
255 pretty_ref, r ? " (unable to update local ref)" : "");
259 current = lookup_commit_reference_gently(ref->old_sha1, 1);
260 updated = lookup_commit_reference_gently(ref->new_sha1, 1);
261 if (!current || !updated) {
265 if (!strncmp(ref->name, "refs/tags/", 10)) {
270 msg = "storing head";
271 what = "[new branch]";
274 r = s_update_ref(msg, ref, 0);
275 sprintf(display, "%c %-*s %-*s -> %s%s", r ? '!' : '*',
276 TRANSPORT_SUMMARY_WIDTH, what, REFCOL_WIDTH, remote, pretty_ref,
277 r ? " (unable to update local ref)" : "");
281 if (in_merge_bases(current, &updated, 1)) {
284 strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV));
285 strcat(quickref, "..");
286 strcat(quickref, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV));
287 r = s_update_ref("fast-forward", ref, 1);
288 sprintf(display, "%c %-*s %-*s -> %s%s", r ? '!' : ' ',
289 TRANSPORT_SUMMARY_WIDTH, quickref, REFCOL_WIDTH, remote,
290 pretty_ref, r ? " (unable to update local ref)" : "");
292 } else if (force || ref->force) {
295 strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV));
296 strcat(quickref, "...");
297 strcat(quickref, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV));
298 r = s_update_ref("forced-update", ref, 1);
299 sprintf(display, "%c %-*s %-*s -> %s (%s)", r ? '!' : '+',
300 TRANSPORT_SUMMARY_WIDTH, quickref, REFCOL_WIDTH, remote,
302 r ? "unable to update local ref" : "forced update");
305 sprintf(display, "! %-*s %-*s -> %s (non-fast-forward)",
306 TRANSPORT_SUMMARY_WIDTH, "[rejected]", REFCOL_WIDTH, remote,
312 static int store_updated_refs(const char *raw_url, const char *remote_name,
316 struct commit *commit;
317 int url_len, i, note_len, shown_url = 0, rc = 0;
319 const char *what, *kind;
321 char *url, *filename = dry_run ? "/dev/null" : git_path("FETCH_HEAD");
323 fp = fopen(filename, "a");
325 return error("cannot open %s: %s\n", filename, strerror(errno));
328 url = transport_anonymize_url(raw_url);
330 url = xstrdup("foreign");
331 for (rm = ref_map; rm; rm = rm->next) {
332 struct ref *ref = NULL;
335 ref = xcalloc(1, sizeof(*ref) + strlen(rm->peer_ref->name) + 1);
336 strcpy(ref->name, rm->peer_ref->name);
337 hashcpy(ref->old_sha1, rm->peer_ref->old_sha1);
338 hashcpy(ref->new_sha1, rm->old_sha1);
339 ref->force = rm->peer_ref->force;
342 commit = lookup_commit_reference_gently(rm->old_sha1, 1);
346 if (!strcmp(rm->name, "HEAD")) {
350 else if (!prefixcmp(rm->name, "refs/heads/")) {
352 what = rm->name + 11;
354 else if (!prefixcmp(rm->name, "refs/tags/")) {
356 what = rm->name + 10;
358 else if (!prefixcmp(rm->name, "refs/remotes/")) {
359 kind = "remote branch";
360 what = rm->name + 13;
367 url_len = strlen(url);
368 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
371 if (4 < i && !strncmp(".git", url + i - 3, 4))
377 note_len += sprintf(note + note_len, "%s ",
379 note_len += sprintf(note + note_len, "'%s' of ", what);
381 note[note_len] = '\0';
382 fprintf(fp, "%s\t%s\t%s",
383 sha1_to_hex(commit ? commit->object.sha1 :
385 rm->merge ? "" : "not-for-merge",
387 for (i = 0; i < url_len; ++i)
395 rc |= update_local_ref(ref, what, note);
397 sprintf(note, "* %-*s %-*s -> FETCH_HEAD",
398 TRANSPORT_SUMMARY_WIDTH, *kind ? kind : "branch",
399 REFCOL_WIDTH, *what ? what : "HEAD");
401 if (verbosity >= 0 && !shown_url) {
402 fprintf(stderr, "From %.*s\n",
407 fprintf(stderr, " %s\n", note);
412 if (rc & STORE_REF_ERROR_DF_CONFLICT)
413 error("some local refs could not be updated; try running\n"
414 " 'git remote prune %s' to remove any old, conflicting "
415 "branches", remote_name);
420 * We would want to bypass the object transfer altogether if
421 * everything we are going to fetch already exists and is connected
424 * The refs we are going to fetch are in ref_map. If running
426 * $ git rev-list --objects --stdin --not --all
428 * (feeding all the refs in ref_map on its standard input)
429 * does not error out, that means everything reachable from the
430 * refs we are going to fetch exists and is connected to some of
433 static int quickfetch(struct ref *ref_map)
435 struct child_process revlist;
438 const char *argv[] = {"rev-list",
439 "--quiet", "--objects", "--stdin", "--not", "--all", NULL};
442 * If we are deepening a shallow clone we already have these
443 * objects reachable. Running rev-list here will return with
444 * a good (0) exit status and we'll bypass the fetch that we
445 * really need to perform. Claiming failure now will ensure
446 * we perform the network exchange to deepen our history.
454 memset(&revlist, 0, sizeof(revlist));
457 revlist.no_stdout = 1;
458 revlist.no_stderr = 1;
461 err = start_command(&revlist);
463 error("could not run rev-list");
468 * If rev-list --stdin encounters an unknown commit, it terminates,
469 * which will cause SIGPIPE in the write loop below.
471 sigchain_push(SIGPIPE, SIG_IGN);
473 for (ref = ref_map; ref; ref = ref->next) {
474 if (write_in_full(revlist.in, sha1_to_hex(ref->old_sha1), 40) < 0 ||
475 write_str_in_full(revlist.in, "\n") < 0) {
476 if (errno != EPIPE && errno != EINVAL)
477 error("failed write to rev-list: %s", strerror(errno));
483 if (close(revlist.in)) {
484 error("failed to close rev-list's stdin: %s", strerror(errno));
488 sigchain_pop(SIGPIPE);
490 return finish_command(&revlist) || err;
493 static int fetch_refs(struct transport *transport, struct ref *ref_map)
495 int ret = quickfetch(ref_map);
497 ret = transport_fetch_refs(transport, ref_map);
499 ret |= store_updated_refs(transport->url,
500 transport->remote->name,
502 transport_unlock_pack(transport);
506 static int prune_refs(struct transport *transport, struct ref *ref_map)
509 struct ref *ref, *stale_refs = get_stale_heads(transport->remote, ref_map);
510 const char *dangling_msg = dry_run
511 ? " (%s will become dangling)\n"
512 : " (%s has become dangling)\n";
514 for (ref = stale_refs; ref; ref = ref->next) {
516 result |= delete_ref(ref->name, NULL, 0);
517 if (verbosity >= 0) {
518 fprintf(stderr, " x %-*s %-*s -> %s\n",
519 TRANSPORT_SUMMARY_WIDTH, "[deleted]",
520 REFCOL_WIDTH, "(none)", prettify_refname(ref->name));
521 warn_dangling_symref(stderr, dangling_msg, ref->name);
524 free_refs(stale_refs);
528 static int add_existing(const char *refname, const unsigned char *sha1,
529 int flag, void *cbdata)
531 struct string_list *list = (struct string_list *)cbdata;
532 struct string_list_item *item = string_list_insert(refname, list);
533 item->util = (void *)sha1;
537 static int will_fetch(struct ref **head, const unsigned char *sha1)
539 struct ref *rm = *head;
541 if (!hashcmp(rm->old_sha1, sha1))
553 static int add_to_tail(struct string_list_item *item, void *cb_data)
555 struct tag_data *data = (struct tag_data *)cb_data;
556 struct ref *rm = NULL;
558 /* We have already decided to ignore this item */
562 rm = alloc_ref(item->string);
563 rm->peer_ref = alloc_ref(item->string);
564 hashcpy(rm->old_sha1, item->util);
567 *data->tail = &rm->next;
572 static void find_non_local_tags(struct transport *transport,
576 struct string_list existing_refs = { NULL, 0, 0, 0 };
577 struct string_list remote_refs = { NULL, 0, 0, 0 };
578 struct tag_data data = {head, tail};
579 const struct ref *ref;
580 struct string_list_item *item = NULL;
582 for_each_ref(add_existing, &existing_refs);
583 for (ref = transport_get_remote_refs(transport); ref; ref = ref->next) {
584 if (prefixcmp(ref->name, "refs/tags"))
588 * The peeled ref always follows the matching base
589 * ref, so if we see a peeled ref that we don't want
590 * to fetch then we can mark the ref entry in the list
591 * as one to ignore by setting util to NULL.
593 if (!strcmp(ref->name + strlen(ref->name) - 3, "^{}")) {
594 if (item && !has_sha1_file(ref->old_sha1) &&
595 !will_fetch(head, ref->old_sha1) &&
596 !has_sha1_file(item->util) &&
597 !will_fetch(head, item->util))
604 * If item is non-NULL here, then we previously saw a
605 * ref not followed by a peeled reference, so we need
606 * to check if it is a lightweight tag that we want to
609 if (item && !has_sha1_file(item->util) &&
610 !will_fetch(head, item->util))
615 /* skip duplicates and refs that we already have */
616 if (string_list_has_string(&remote_refs, ref->name) ||
617 string_list_has_string(&existing_refs, ref->name))
620 item = string_list_insert(ref->name, &remote_refs);
621 item->util = (void *)ref->old_sha1;
623 string_list_clear(&existing_refs, 0);
626 * We may have a final lightweight tag that needs to be
627 * checked to see if it needs fetching.
629 if (item && !has_sha1_file(item->util) &&
630 !will_fetch(head, item->util))
634 * For all the tags in the remote_refs string list, call
635 * add_to_tail to add them to the list of refs to be fetched
637 for_each_string_list(add_to_tail, &remote_refs, &data);
639 string_list_clear(&remote_refs, 0);
642 static void check_not_current_branch(struct ref *ref_map)
644 struct branch *current_branch = branch_get(NULL);
646 if (is_bare_repository() || !current_branch)
649 for (; ref_map; ref_map = ref_map->next)
650 if (ref_map->peer_ref && !strcmp(current_branch->refname,
651 ref_map->peer_ref->name))
652 die("Refusing to fetch into current branch %s "
653 "of non-bare repository", current_branch->refname);
656 static int truncate_fetch_head(void)
658 char *filename = git_path("FETCH_HEAD");
659 FILE *fp = fopen(filename, "w");
662 return error("cannot open %s: %s\n", filename, strerror(errno));
667 static int do_fetch(struct transport *transport,
668 struct refspec *refs, int ref_count)
670 struct string_list existing_refs = { NULL, 0, 0, 0 };
671 struct string_list_item *peer_item = NULL;
674 int autotags = (transport->remote->fetch_tags == 1);
676 for_each_ref(add_existing, &existing_refs);
678 if (transport->remote->fetch_tags == 2 && tags != TAGS_UNSET)
680 if (transport->remote->fetch_tags == -1)
683 if (!transport->get_refs_list || !transport->fetch)
684 die("Don't know how to fetch from %s", transport->url);
686 /* if not appending, truncate FETCH_HEAD */
687 if (!append && !dry_run) {
688 int errcode = truncate_fetch_head();
693 ref_map = get_ref_map(transport, refs, ref_count, tags, &autotags);
695 check_not_current_branch(ref_map);
697 for (rm = ref_map; rm; rm = rm->next) {
699 peer_item = string_list_lookup(rm->peer_ref->name,
702 hashcpy(rm->peer_ref->old_sha1,
707 if (tags == TAGS_DEFAULT && autotags)
708 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
709 if (fetch_refs(transport, ref_map)) {
714 prune_refs(transport, ref_map);
717 /* if neither --no-tags nor --tags was specified, do automated tag
719 if (tags == TAGS_DEFAULT && autotags) {
720 struct ref **tail = &ref_map;
722 find_non_local_tags(transport, &ref_map, &tail);
724 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
725 transport_set_option(transport, TRANS_OPT_DEPTH, "0");
726 fetch_refs(transport, ref_map);
734 static void set_option(const char *name, const char *value)
736 int r = transport_set_option(transport, name, value);
738 die("Option \"%s\" value \"%s\" is not valid for %s",
739 name, value, transport->url);
741 warning("Option \"%s\" is ignored for %s\n",
742 name, transport->url);
745 static int get_one_remote_for_fetch(struct remote *remote, void *priv)
747 struct string_list *list = priv;
748 if (!remote->skip_default_update)
749 string_list_append(remote->name, list);
753 struct remote_group_data {
755 struct string_list *list;
758 static int get_remote_group(const char *key, const char *value, void *priv)
760 struct remote_group_data *g = priv;
762 if (!prefixcmp(key, "remotes.") &&
763 !strcmp(key + 8, g->name)) {
764 /* split list by white space */
765 int space = strcspn(value, " \t\n");
768 string_list_append(xstrndup(value, space),
771 value += space + (value[space] != '\0');
772 space = strcspn(value, " \t\n");
779 static int add_remote_or_group(const char *name, struct string_list *list)
781 int prev_nr = list->nr;
782 struct remote_group_data g = { name, list };
784 git_config(get_remote_group, &g);
785 if (list->nr == prev_nr) {
786 struct remote *remote;
787 if (!remote_is_configured(name))
789 remote = remote_get(name);
790 string_list_append(remote->name, list);
795 static int fetch_multiple(struct string_list *list)
798 const char *argv[11] = { "fetch", "--append" };
802 argv[argc++] = "--dry-run";
804 argv[argc++] = "--prune";
806 argv[argc++] = "--update-head-ok";
808 argv[argc++] = "--force";
810 argv[argc++] = "--keep";
815 else if (verbosity < 0)
818 if (!append && !dry_run) {
819 int errcode = truncate_fetch_head();
824 for (i = 0; i < list->nr; i++) {
825 const char *name = list->items[i].string;
827 argv[argc + 1] = NULL;
829 printf("Fetching %s\n", name);
830 if (run_command_v_opt(argv, RUN_GIT_CMD)) {
831 error("Could not fetch %s", name);
839 static int fetch_one(struct remote *remote, int argc, const char **argv)
842 static const char **refs = NULL;
847 die("Where do you want to fetch from today?");
849 transport = transport_get(remote, NULL);
850 transport_set_verbosity(transport, verbosity, progress);
852 set_option(TRANS_OPT_UPLOADPACK, upload_pack);
854 set_option(TRANS_OPT_KEEP, "yes");
856 set_option(TRANS_OPT_DEPTH, depth);
860 refs = xcalloc(argc + 1, sizeof(const char *));
861 for (i = 0; i < argc; i++) {
862 if (!strcmp(argv[i], "tag")) {
866 die("You need to specify a tag name.");
867 ref = xmalloc(strlen(argv[i]) * 2 + 22);
868 strcpy(ref, "refs/tags/");
869 strcat(ref, argv[i]);
870 strcat(ref, ":refs/tags/");
871 strcat(ref, argv[i]);
880 sigchain_push_common(unlock_pack_on_signal);
882 exit_code = do_fetch(transport,
883 parse_fetch_refspec(ref_nr, refs), ref_nr);
884 transport_disconnect(transport);
889 int cmd_fetch(int argc, const char **argv, const char *prefix)
892 struct string_list list = { NULL, 0, 0, 0 };
893 struct remote *remote;
896 /* Record the command line for the reflog */
897 strbuf_addstr(&default_rla, "fetch");
898 for (i = 1; i < argc; i++)
899 strbuf_addf(&default_rla, " %s", argv[i]);
901 argc = parse_options(argc, argv, prefix,
902 builtin_fetch_options, builtin_fetch_usage, 0);
906 die("fetch --all does not take a repository argument");
908 die("fetch --all does not make sense with refspecs");
909 (void) for_each_remote(get_one_remote_for_fetch, &list);
910 result = fetch_multiple(&list);
911 } else if (argc == 0) {
912 /* No arguments -- use default remote */
913 remote = remote_get(NULL);
914 result = fetch_one(remote, argc, argv);
915 } else if (multiple) {
916 /* All arguments are assumed to be remotes or groups */
917 for (i = 0; i < argc; i++)
918 if (!add_remote_or_group(argv[i], &list))
919 die("No such remote or remote group: %s", argv[i]);
920 result = fetch_multiple(&list);
922 /* Single remote or group */
923 (void) add_remote_or_group(argv[0], &list);
925 /* More than one remote */
927 die("Fetching a group and specifying refspecs does not make sense");
928 result = fetch_multiple(&list);
930 /* Zero or one remotes */
931 remote = remote_get(argv[0]);
932 result = fetch_one(remote, argc-1, argv+1);
936 /* All names were strdup()ed or strndup()ed */
937 list.strdup_strings = 1;
938 string_list_clear(&list, 0);