Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1 | /* |
| 2 | * "git fetch" |
| 3 | */ |
| 4 | #include "cache.h" |
| 5 | #include "refs.h" |
| 6 | #include "commit.h" |
| 7 | #include "builtin.h" |
Johannes Schindelin | c455c87 | 2008-07-21 19:03:49 +0100 | [diff] [blame] | 8 | #include "string-list.h" |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 9 | #include "remote.h" |
| 10 | #include "transport.h" |
Shawn O. Pearce | 4191c35 | 2007-11-11 02:29:47 -0500 | [diff] [blame] | 11 | #include "run-command.h" |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 12 | #include "parse-options.h" |
Jeff King | 4a16d07 | 2009-01-22 01:02:35 -0500 | [diff] [blame] | 13 | #include "sigchain.h" |
Michael Lukashov | f1863d0 | 2010-02-16 23:42:52 +0000 | [diff] [blame] | 14 | #include "transport.h" |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 15 | #include "submodule.h" |
Junio C Hamano | f96400c | 2011-09-02 16:33:22 -0700 | [diff] [blame] | 16 | #include "connected.h" |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 17 | #include "argv-array.h" |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 18 | |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 19 | static const char * const builtin_fetch_usage[] = { |
Nguyễn Thái Ngọc Duy | 719aced | 2012-08-20 19:32:09 +0700 | [diff] [blame] | 20 | N_("git fetch [<options>] [<repository> [<refspec>...]]"), |
| 21 | N_("git fetch [<options>] <group>"), |
| 22 | N_("git fetch --multiple [<options>] [(<repository> | <group>)...]"), |
| 23 | N_("git fetch --all [<options>]"), |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 24 | NULL |
| 25 | }; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 26 | |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 27 | enum { |
| 28 | TAGS_UNSET = 0, |
| 29 | TAGS_DEFAULT = 1, |
| 30 | TAGS_SET = 2 |
| 31 | }; |
| 32 | |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 33 | static int fetch_prune_config = -1; /* unspecified */ |
| 34 | static int prune = -1; /* unspecified */ |
| 35 | #define PRUNE_BY_DEFAULT 0 /* do we prune by default? */ |
| 36 | |
| 37 | static int all, append, dry_run, force, keep, multiple, update_head_ok, verbosity; |
Clemens Buchacher | 01fdc21 | 2012-02-13 21:17:15 +0100 | [diff] [blame] | 38 | static int progress = -1, recurse_submodules = RECURSE_SUBMODULES_DEFAULT; |
Nguyễn Thái Ngọc Duy | 48d25ca | 2013-12-05 20:02:42 +0700 | [diff] [blame] | 39 | static int tags = TAGS_DEFAULT, unshallow, update_shallow; |
Shawn O. Pearce | 4191c35 | 2007-11-11 02:29:47 -0500 | [diff] [blame] | 40 | static const char *depth; |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 41 | static const char *upload_pack; |
Kristian Høgsberg | 2d324ef | 2007-12-04 02:25:46 -0500 | [diff] [blame] | 42 | static struct strbuf default_rla = STRBUF_INIT; |
Junio C Hamano | af23445 | 2013-08-07 15:38:45 -0700 | [diff] [blame] | 43 | static struct transport *gtransport; |
Junio C Hamano | b26ed43 | 2013-08-07 15:47:18 -0700 | [diff] [blame] | 44 | static struct transport *gsecondary; |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 45 | static const char *submodule_prefix = ""; |
Jens Lehmann | 88a2197 | 2011-03-06 23:10:46 +0100 | [diff] [blame] | 46 | static const char *recurse_submodules_default; |
Tom Miller | 4b3b33a | 2014-01-02 20:28:51 -0600 | [diff] [blame] | 47 | static int shown_url = 0; |
Junio C Hamano | c5558f8 | 2014-05-29 15:21:31 -0700 | [diff] [blame] | 48 | static int refmap_alloc, refmap_nr; |
| 49 | static const char **refmap_array; |
Shawn O. Pearce | e4022ed | 2007-09-14 03:31:25 -0400 | [diff] [blame] | 50 | |
Jens Lehmann | 8f0700d | 2011-03-06 23:11:21 +0100 | [diff] [blame] | 51 | static int option_parse_recurse_submodules(const struct option *opt, |
| 52 | const char *arg, int unset) |
| 53 | { |
| 54 | if (unset) { |
| 55 | recurse_submodules = RECURSE_SUBMODULES_OFF; |
| 56 | } else { |
| 57 | if (arg) |
| 58 | recurse_submodules = parse_fetch_recurse_submodules_arg(opt->long_name, arg); |
| 59 | else |
| 60 | recurse_submodules = RECURSE_SUBMODULES_ON; |
| 61 | } |
| 62 | return 0; |
| 63 | } |
Shawn O. Pearce | e4022ed | 2007-09-14 03:31:25 -0400 | [diff] [blame] | 64 | |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 65 | static int git_fetch_config(const char *k, const char *v, void *cb) |
| 66 | { |
| 67 | if (!strcmp(k, "fetch.prune")) { |
| 68 | fetch_prune_config = git_config_bool(k, v); |
| 69 | return 0; |
| 70 | } |
Jeff King | 72549df | 2014-11-04 08:11:19 -0500 | [diff] [blame] | 71 | return git_default_config(k, v, cb); |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 72 | } |
| 73 | |
Junio C Hamano | c5558f8 | 2014-05-29 15:21:31 -0700 | [diff] [blame] | 74 | static int parse_refmap_arg(const struct option *opt, const char *arg, int unset) |
| 75 | { |
| 76 | ALLOC_GROW(refmap_array, refmap_nr + 1, refmap_alloc); |
| 77 | |
| 78 | /* |
| 79 | * "git fetch --refmap='' origin foo" |
| 80 | * can be used to tell the command not to store anywhere |
| 81 | */ |
| 82 | if (*arg) |
| 83 | refmap_array[refmap_nr++] = arg; |
| 84 | return 0; |
| 85 | } |
| 86 | |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 87 | static struct option builtin_fetch_options[] = { |
Tuncer Ayaz | 7f87aff | 2008-11-15 01:14:24 +0100 | [diff] [blame] | 88 | OPT__VERBOSITY(&verbosity), |
Stefan Beller | d5d09d4 | 2013-08-03 13:51:19 +0200 | [diff] [blame] | 89 | OPT_BOOL(0, "all", &all, |
| 90 | N_("fetch from all remotes")), |
| 91 | OPT_BOOL('a', "append", &append, |
| 92 | N_("append to .git/FETCH_HEAD instead of overwriting")), |
Nguyễn Thái Ngọc Duy | 719aced | 2012-08-20 19:32:09 +0700 | [diff] [blame] | 93 | OPT_STRING(0, "upload-pack", &upload_pack, N_("path"), |
| 94 | N_("path to upload pack on remote end")), |
| 95 | OPT__FORCE(&force, N_("force overwrite of local branch")), |
Stefan Beller | d5d09d4 | 2013-08-03 13:51:19 +0200 | [diff] [blame] | 96 | OPT_BOOL('m', "multiple", &multiple, |
| 97 | N_("fetch from multiple remotes")), |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 98 | OPT_SET_INT('t', "tags", &tags, |
Nguyễn Thái Ngọc Duy | 719aced | 2012-08-20 19:32:09 +0700 | [diff] [blame] | 99 | N_("fetch all tags and associated objects"), TAGS_SET), |
Johannes Schindelin | e795129 | 2008-03-13 08:13:15 +0100 | [diff] [blame] | 100 | OPT_SET_INT('n', NULL, &tags, |
Nguyễn Thái Ngọc Duy | 719aced | 2012-08-20 19:32:09 +0700 | [diff] [blame] | 101 | N_("do not fetch all tags (--no-tags)"), TAGS_UNSET), |
Stefan Beller | d5d09d4 | 2013-08-03 13:51:19 +0200 | [diff] [blame] | 102 | OPT_BOOL('p', "prune", &prune, |
| 103 | N_("prune remote-tracking branches no longer on remote")), |
Nguyễn Thái Ngọc Duy | 719aced | 2012-08-20 19:32:09 +0700 | [diff] [blame] | 104 | { OPTION_CALLBACK, 0, "recurse-submodules", NULL, N_("on-demand"), |
| 105 | N_("control recursive fetching of submodules"), |
Jens Lehmann | 8f0700d | 2011-03-06 23:11:21 +0100 | [diff] [blame] | 106 | PARSE_OPT_OPTARG, option_parse_recurse_submodules }, |
Stefan Beller | d5d09d4 | 2013-08-03 13:51:19 +0200 | [diff] [blame] | 107 | OPT_BOOL(0, "dry-run", &dry_run, |
| 108 | N_("dry run")), |
| 109 | OPT_BOOL('k', "keep", &keep, N_("keep downloaded pack")), |
| 110 | OPT_BOOL('u', "update-head-ok", &update_head_ok, |
Nguyễn Thái Ngọc Duy | 719aced | 2012-08-20 19:32:09 +0700 | [diff] [blame] | 111 | N_("allow updating of HEAD ref")), |
| 112 | OPT_BOOL(0, "progress", &progress, N_("force progress reporting")), |
| 113 | OPT_STRING(0, "depth", &depth, N_("depth"), |
| 114 | N_("deepen history of shallow clone")), |
Nguyễn Thái Ngọc Duy | 4dcb167 | 2013-01-11 16:05:46 +0700 | [diff] [blame] | 115 | { OPTION_SET_INT, 0, "unshallow", &unshallow, NULL, |
| 116 | N_("convert to a complete repository"), |
| 117 | PARSE_OPT_NONEG | PARSE_OPT_NOARG, NULL, 1 }, |
Nguyễn Thái Ngọc Duy | 719aced | 2012-08-20 19:32:09 +0700 | [diff] [blame] | 118 | { OPTION_STRING, 0, "submodule-prefix", &submodule_prefix, N_("dir"), |
| 119 | N_("prepend this to submodule path output"), PARSE_OPT_HIDDEN }, |
Jens Lehmann | 88a2197 | 2011-03-06 23:10:46 +0100 | [diff] [blame] | 120 | { OPTION_STRING, 0, "recurse-submodules-default", |
| 121 | &recurse_submodules_default, NULL, |
Nguyễn Thái Ngọc Duy | 719aced | 2012-08-20 19:32:09 +0700 | [diff] [blame] | 122 | N_("default mode for recursion"), PARSE_OPT_HIDDEN }, |
Nguyễn Thái Ngọc Duy | 48d25ca | 2013-12-05 20:02:42 +0700 | [diff] [blame] | 123 | OPT_BOOL(0, "update-shallow", &update_shallow, |
| 124 | N_("accept refs that update .git/shallow")), |
Junio C Hamano | c5558f8 | 2014-05-29 15:21:31 -0700 | [diff] [blame] | 125 | { OPTION_CALLBACK, 0, "refmap", NULL, N_("refmap"), |
| 126 | N_("specify fetch refmap"), PARSE_OPT_NONEG, parse_refmap_arg }, |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 127 | OPT_END() |
| 128 | }; |
| 129 | |
Shawn O. Pearce | e4022ed | 2007-09-14 03:31:25 -0400 | [diff] [blame] | 130 | static void unlock_pack(void) |
| 131 | { |
Junio C Hamano | af23445 | 2013-08-07 15:38:45 -0700 | [diff] [blame] | 132 | if (gtransport) |
| 133 | transport_unlock_pack(gtransport); |
Junio C Hamano | b26ed43 | 2013-08-07 15:47:18 -0700 | [diff] [blame] | 134 | if (gsecondary) |
| 135 | transport_unlock_pack(gsecondary); |
Shawn O. Pearce | e4022ed | 2007-09-14 03:31:25 -0400 | [diff] [blame] | 136 | } |
| 137 | |
| 138 | static void unlock_pack_on_signal(int signo) |
| 139 | { |
| 140 | unlock_pack(); |
Jeff King | 4a16d07 | 2009-01-22 01:02:35 -0500 | [diff] [blame] | 141 | sigchain_pop(signo); |
Shawn O. Pearce | e4022ed | 2007-09-14 03:31:25 -0400 | [diff] [blame] | 142 | raise(signo); |
| 143 | } |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 144 | |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 145 | static void add_merge_config(struct ref **head, |
Daniel Barkalow | 4577370 | 2007-10-29 21:05:40 -0400 | [diff] [blame] | 146 | const struct ref *remote_refs, |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 147 | struct branch *branch, |
| 148 | struct ref ***tail) |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 149 | { |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 150 | int i; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 151 | |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 152 | for (i = 0; i < branch->merge_nr; i++) { |
| 153 | struct ref *rm, **old_tail = *tail; |
| 154 | struct refspec refspec; |
| 155 | |
| 156 | for (rm = *head; rm; rm = rm->next) { |
| 157 | if (branch_merge_matches(branch, i, rm->name)) { |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 158 | rm->fetch_head_status = FETCH_HEAD_MERGE; |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 159 | break; |
| 160 | } |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 161 | } |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 162 | if (rm) |
| 163 | continue; |
| 164 | |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 165 | /* |
Matthieu Moy | 8b3f3f8 | 2010-11-02 16:31:23 +0100 | [diff] [blame] | 166 | * Not fetched to a remote-tracking branch? We need to fetch |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 167 | * it anyway to allow this branch's "branch.$name.merge" |
Heikki Orsila | 05207a2 | 2008-09-09 13:28:30 +0300 | [diff] [blame] | 168 | * to be honored by 'git pull', but we do not have to |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 169 | * fail if branch.$name.merge is misconfigured to point |
| 170 | * at a nonexisting branch. If we were indeed called by |
Heikki Orsila | 05207a2 | 2008-09-09 13:28:30 +0300 | [diff] [blame] | 171 | * 'git pull', it will notice the misconfiguration because |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 172 | * there is no entry in the resulting FETCH_HEAD marked |
| 173 | * for merging. |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 174 | */ |
Andreas Gruenbacher | 8da61a2 | 2010-03-12 23:27:33 +0100 | [diff] [blame] | 175 | memset(&refspec, 0, sizeof(refspec)); |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 176 | refspec.src = branch->merge[i]->src; |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 177 | get_fetch_map(remote_refs, &refspec, tail, 1); |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 178 | for (rm = *old_tail; rm; rm = rm->next) |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 179 | rm->fetch_head_status = FETCH_HEAD_MERGE; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 180 | } |
| 181 | } |
| 182 | |
Michael Haggerty | a0fbb5a | 2013-10-30 06:32:55 +0100 | [diff] [blame] | 183 | static int add_existing(const char *refname, const unsigned char *sha1, |
| 184 | int flag, void *cbdata) |
| 185 | { |
| 186 | struct string_list *list = (struct string_list *)cbdata; |
| 187 | struct string_list_item *item = string_list_insert(list, refname); |
| 188 | item->util = xmalloc(20); |
| 189 | hashcpy(item->util, sha1); |
| 190 | return 0; |
| 191 | } |
| 192 | |
| 193 | static int will_fetch(struct ref **head, const unsigned char *sha1) |
| 194 | { |
| 195 | struct ref *rm = *head; |
| 196 | while (rm) { |
| 197 | if (!hashcmp(rm->old_sha1, sha1)) |
| 198 | return 1; |
| 199 | rm = rm->next; |
| 200 | } |
| 201 | return 0; |
| 202 | } |
| 203 | |
Shawn O. Pearce | 767f176 | 2008-03-02 21:35:25 -0500 | [diff] [blame] | 204 | static void find_non_local_tags(struct transport *transport, |
| 205 | struct ref **head, |
Michael Haggerty | a0fbb5a | 2013-10-30 06:32:55 +0100 | [diff] [blame] | 206 | struct ref ***tail) |
| 207 | { |
| 208 | struct string_list existing_refs = STRING_LIST_INIT_DUP; |
| 209 | struct string_list remote_refs = STRING_LIST_INIT_NODUP; |
| 210 | const struct ref *ref; |
| 211 | struct string_list_item *item = NULL; |
| 212 | |
| 213 | for_each_ref(add_existing, &existing_refs); |
| 214 | for (ref = transport_get_remote_refs(transport); ref; ref = ref->next) { |
Junio C Hamano | ad70448 | 2013-12-17 11:47:35 -0800 | [diff] [blame] | 215 | if (!starts_with(ref->name, "refs/tags/")) |
Michael Haggerty | a0fbb5a | 2013-10-30 06:32:55 +0100 | [diff] [blame] | 216 | continue; |
| 217 | |
| 218 | /* |
| 219 | * The peeled ref always follows the matching base |
| 220 | * ref, so if we see a peeled ref that we don't want |
| 221 | * to fetch then we can mark the ref entry in the list |
| 222 | * as one to ignore by setting util to NULL. |
| 223 | */ |
Junio C Hamano | ad70448 | 2013-12-17 11:47:35 -0800 | [diff] [blame] | 224 | if (ends_with(ref->name, "^{}")) { |
Michael Haggerty | a0fbb5a | 2013-10-30 06:32:55 +0100 | [diff] [blame] | 225 | if (item && !has_sha1_file(ref->old_sha1) && |
| 226 | !will_fetch(head, ref->old_sha1) && |
| 227 | !has_sha1_file(item->util) && |
| 228 | !will_fetch(head, item->util)) |
| 229 | item->util = NULL; |
| 230 | item = NULL; |
| 231 | continue; |
| 232 | } |
| 233 | |
| 234 | /* |
| 235 | * If item is non-NULL here, then we previously saw a |
| 236 | * ref not followed by a peeled reference, so we need |
| 237 | * to check if it is a lightweight tag that we want to |
| 238 | * fetch. |
| 239 | */ |
| 240 | if (item && !has_sha1_file(item->util) && |
| 241 | !will_fetch(head, item->util)) |
| 242 | item->util = NULL; |
| 243 | |
| 244 | item = NULL; |
| 245 | |
| 246 | /* skip duplicates and refs that we already have */ |
| 247 | if (string_list_has_string(&remote_refs, ref->name) || |
| 248 | string_list_has_string(&existing_refs, ref->name)) |
| 249 | continue; |
| 250 | |
| 251 | item = string_list_insert(&remote_refs, ref->name); |
| 252 | item->util = (void *)ref->old_sha1; |
| 253 | } |
| 254 | string_list_clear(&existing_refs, 1); |
| 255 | |
| 256 | /* |
| 257 | * We may have a final lightweight tag that needs to be |
| 258 | * checked to see if it needs fetching. |
| 259 | */ |
| 260 | if (item && !has_sha1_file(item->util) && |
| 261 | !will_fetch(head, item->util)) |
| 262 | item->util = NULL; |
| 263 | |
| 264 | /* |
| 265 | * For all the tags in the remote_refs string list, |
| 266 | * add them to the list of refs to be fetched |
| 267 | */ |
| 268 | for_each_string_list_item(item, &remote_refs) { |
| 269 | /* Unless we have already decided to ignore this item... */ |
| 270 | if (item->util) |
| 271 | { |
| 272 | struct ref *rm = alloc_ref(item->string); |
| 273 | rm->peer_ref = alloc_ref(item->string); |
| 274 | hashcpy(rm->old_sha1, item->util); |
| 275 | **tail = rm; |
| 276 | *tail = &rm->next; |
| 277 | } |
| 278 | } |
| 279 | |
| 280 | string_list_clear(&remote_refs, 0); |
| 281 | } |
Shawn O. Pearce | 767f176 | 2008-03-02 21:35:25 -0500 | [diff] [blame] | 282 | |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 283 | static struct ref *get_ref_map(struct transport *transport, |
Michael Haggerty | f137a45 | 2013-10-23 17:50:38 +0200 | [diff] [blame] | 284 | struct refspec *refspecs, int refspec_count, |
| 285 | int tags, int *autotags) |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 286 | { |
| 287 | int i; |
| 288 | struct ref *rm; |
| 289 | struct ref *ref_map = NULL; |
| 290 | struct ref **tail = &ref_map; |
| 291 | |
Michael Haggerty | c5a84e9 | 2013-10-30 06:32:59 +0100 | [diff] [blame] | 292 | /* opportunistically-updated references: */ |
| 293 | struct ref *orefs = NULL, **oref_tail = &orefs; |
| 294 | |
Daniel Barkalow | 4577370 | 2007-10-29 21:05:40 -0400 | [diff] [blame] | 295 | const struct ref *remote_refs = transport_get_remote_refs(transport); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 296 | |
Michael Haggerty | c5a84e9 | 2013-10-30 06:32:59 +0100 | [diff] [blame] | 297 | if (refspec_count) { |
Junio C Hamano | c5558f8 | 2014-05-29 15:21:31 -0700 | [diff] [blame] | 298 | struct refspec *fetch_refspec; |
| 299 | int fetch_refspec_nr; |
| 300 | |
Michael Haggerty | f137a45 | 2013-10-23 17:50:38 +0200 | [diff] [blame] | 301 | for (i = 0; i < refspec_count; i++) { |
| 302 | get_fetch_map(remote_refs, &refspecs[i], &tail, 0); |
| 303 | if (refspecs[i].dst && refspecs[i].dst[0]) |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 304 | *autotags = 1; |
| 305 | } |
Michael Haggerty | 0281c93 | 2013-10-30 06:32:58 +0100 | [diff] [blame] | 306 | /* Merge everything on the command line (but not --tags) */ |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 307 | for (rm = ref_map; rm; rm = rm->next) |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 308 | rm->fetch_head_status = FETCH_HEAD_MERGE; |
Michael Haggerty | 0281c93 | 2013-10-30 06:32:58 +0100 | [diff] [blame] | 309 | |
| 310 | /* |
| 311 | * For any refs that we happen to be fetching via |
| 312 | * command-line arguments, the destination ref might |
| 313 | * have been missing or have been different than the |
| 314 | * remote-tracking ref that would be derived from the |
| 315 | * configured refspec. In these cases, we want to |
| 316 | * take the opportunity to update their configured |
| 317 | * remote-tracking reference. However, we do not want |
| 318 | * to mention these entries in FETCH_HEAD at all, as |
| 319 | * they would simply be duplicates of existing |
| 320 | * entries, so we set them FETCH_HEAD_IGNORE below. |
| 321 | * |
| 322 | * We compute these entries now, based only on the |
| 323 | * refspecs specified on the command line. But we add |
| 324 | * them to the list following the refspecs resulting |
| 325 | * from the tags option so that one of the latter, |
| 326 | * which has FETCH_HEAD_NOT_FOR_MERGE, is not removed |
| 327 | * by ref_remove_duplicates() in favor of one of these |
| 328 | * opportunistic entries with FETCH_HEAD_IGNORE. |
| 329 | */ |
Junio C Hamano | c5558f8 | 2014-05-29 15:21:31 -0700 | [diff] [blame] | 330 | if (refmap_array) { |
| 331 | fetch_refspec = parse_fetch_refspec(refmap_nr, refmap_array); |
| 332 | fetch_refspec_nr = refmap_nr; |
| 333 | } else { |
| 334 | fetch_refspec = transport->remote->fetch; |
| 335 | fetch_refspec_nr = transport->remote->fetch_refspec_nr; |
| 336 | } |
| 337 | |
| 338 | for (i = 0; i < fetch_refspec_nr; i++) |
| 339 | get_fetch_map(ref_map, &fetch_refspec[i], &oref_tail, 1); |
Michael Haggerty | 0281c93 | 2013-10-30 06:32:58 +0100 | [diff] [blame] | 340 | |
Daniel Barkalow | e0aaa29 | 2008-04-17 19:32:35 -0400 | [diff] [blame] | 341 | if (tags == TAGS_SET) |
| 342 | get_fetch_map(remote_refs, tag_refspec, &tail, 0); |
Junio C Hamano | c5558f8 | 2014-05-29 15:21:31 -0700 | [diff] [blame] | 343 | } else if (refmap_array) { |
| 344 | die("--refmap option is only meaningful with command-line refspec(s)."); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 345 | } else { |
| 346 | /* Use the defaults */ |
| 347 | struct remote *remote = transport->remote; |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 348 | struct branch *branch = branch_get(NULL); |
| 349 | int has_merge = branch_has_merge_config(branch); |
Brandon Casey | 3ee1757 | 2010-08-25 12:52:56 -0500 | [diff] [blame] | 350 | if (remote && |
| 351 | (remote->fetch_refspec_nr || |
Brandon Casey | f31dbdc | 2010-09-09 13:56:36 -0500 | [diff] [blame] | 352 | /* Note: has_merge implies non-NULL branch->remote_name */ |
Brandon Casey | 3ee1757 | 2010-08-25 12:52:56 -0500 | [diff] [blame] | 353 | (has_merge && !strcmp(branch->remote_name, remote->name)))) { |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 354 | for (i = 0; i < remote->fetch_refspec_nr; i++) { |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 355 | get_fetch_map(remote_refs, &remote->fetch[i], &tail, 0); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 356 | if (remote->fetch[i].dst && |
| 357 | remote->fetch[i].dst[0]) |
| 358 | *autotags = 1; |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 359 | if (!i && !has_merge && ref_map && |
Daniel Barkalow | cfb8f89 | 2007-09-28 19:34:17 -0400 | [diff] [blame] | 360 | !remote->fetch[0].pattern) |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 361 | ref_map->fetch_head_status = FETCH_HEAD_MERGE; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 362 | } |
Johannes Schindelin | da0204d | 2007-10-11 01:47:55 +0100 | [diff] [blame] | 363 | /* |
| 364 | * if the remote we're fetching from is the same |
| 365 | * as given in branch.<name>.remote, we add the |
| 366 | * ref given in branch.<name>.merge, too. |
Brandon Casey | f31dbdc | 2010-09-09 13:56:36 -0500 | [diff] [blame] | 367 | * |
| 368 | * Note: has_merge implies non-NULL branch->remote_name |
Johannes Schindelin | da0204d | 2007-10-11 01:47:55 +0100 | [diff] [blame] | 369 | */ |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 370 | if (has_merge && |
| 371 | !strcmp(branch->remote_name, remote->name)) |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 372 | add_merge_config(&ref_map, remote_refs, branch, &tail); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 373 | } else { |
| 374 | ref_map = get_remote_ref(remote_refs, "HEAD"); |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 375 | if (!ref_map) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 376 | die(_("Couldn't find remote ref HEAD")); |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 377 | ref_map->fetch_head_status = FETCH_HEAD_MERGE; |
Shawn O. Pearce | 5aaf7f2 | 2008-03-02 21:34:51 -0500 | [diff] [blame] | 378 | tail = &ref_map->next; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 379 | } |
| 380 | } |
Michael Haggerty | 0281c93 | 2013-10-30 06:32:58 +0100 | [diff] [blame] | 381 | |
Michael Haggerty | c5a84e9 | 2013-10-30 06:32:59 +0100 | [diff] [blame] | 382 | if (tags == TAGS_SET) |
| 383 | /* also fetch all tags */ |
| 384 | get_fetch_map(remote_refs, tag_refspec, &tail, 0); |
| 385 | else if (tags == TAGS_DEFAULT && *autotags) |
Shawn O. Pearce | 767f176 | 2008-03-02 21:35:25 -0500 | [diff] [blame] | 386 | find_non_local_tags(transport, &ref_map, &tail); |
Michael Haggerty | 0281c93 | 2013-10-30 06:32:58 +0100 | [diff] [blame] | 387 | |
Michael Haggerty | c5a84e9 | 2013-10-30 06:32:59 +0100 | [diff] [blame] | 388 | /* Now append any refs to be updated opportunistically: */ |
| 389 | *tail = orefs; |
| 390 | for (rm = orefs; rm; rm = rm->next) { |
| 391 | rm->fetch_head_status = FETCH_HEAD_IGNORE; |
| 392 | tail = &rm->next; |
| 393 | } |
| 394 | |
Michael Haggerty | b9afe66 | 2013-10-30 06:33:09 +0100 | [diff] [blame] | 395 | return ref_remove_duplicates(ref_map); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 396 | } |
| 397 | |
Jeff King | fa25075 | 2009-05-25 06:40:54 -0400 | [diff] [blame] | 398 | #define STORE_REF_ERROR_OTHER 1 |
| 399 | #define STORE_REF_ERROR_DF_CONFLICT 2 |
| 400 | |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 401 | static int s_update_ref(const char *action, |
| 402 | struct ref *ref, |
| 403 | int check_old) |
| 404 | { |
| 405 | char msg[1024]; |
| 406 | char *rla = getenv("GIT_REFLOG_ACTION"); |
Ronnie Sahlberg | cd94f76 | 2014-04-28 13:49:07 -0700 | [diff] [blame] | 407 | struct ref_transaction *transaction; |
| 408 | struct strbuf err = STRBUF_INIT; |
| 409 | int ret, df_conflict = 0; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 410 | |
Jay Soffian | 28a1540 | 2009-11-10 09:19:43 +0100 | [diff] [blame] | 411 | if (dry_run) |
| 412 | return 0; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 413 | if (!rla) |
Kristian Høgsberg | 2d324ef | 2007-12-04 02:25:46 -0500 | [diff] [blame] | 414 | rla = default_rla.buf; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 415 | snprintf(msg, sizeof(msg), "%s: %s", rla, action); |
Ronnie Sahlberg | cd94f76 | 2014-04-28 13:49:07 -0700 | [diff] [blame] | 416 | |
| 417 | transaction = ref_transaction_begin(&err); |
| 418 | if (!transaction || |
Michael Haggerty | 1d147bd | 2015-02-17 18:00:15 +0100 | [diff] [blame^] | 419 | ref_transaction_update(transaction, ref->name, |
| 420 | ref->new_sha1, |
| 421 | check_old ? ref->old_sha1 : NULL, |
| 422 | 0, msg, &err)) |
Ronnie Sahlberg | cd94f76 | 2014-04-28 13:49:07 -0700 | [diff] [blame] | 423 | goto fail; |
| 424 | |
| 425 | ret = ref_transaction_commit(transaction, &err); |
| 426 | if (ret) { |
| 427 | df_conflict = (ret == TRANSACTION_NAME_CONFLICT); |
| 428 | goto fail; |
| 429 | } |
| 430 | |
| 431 | ref_transaction_free(transaction); |
| 432 | strbuf_release(&err); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 433 | return 0; |
Ronnie Sahlberg | cd94f76 | 2014-04-28 13:49:07 -0700 | [diff] [blame] | 434 | fail: |
| 435 | ref_transaction_free(transaction); |
| 436 | error("%s", err.buf); |
| 437 | strbuf_release(&err); |
| 438 | return df_conflict ? STORE_REF_ERROR_DF_CONFLICT |
| 439 | : STORE_REF_ERROR_OTHER; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 440 | } |
| 441 | |
Pierre Habouzit | 9ef4272 | 2007-11-04 15:05:45 -0800 | [diff] [blame] | 442 | #define REFCOL_WIDTH 10 |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 443 | |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 444 | static int update_local_ref(struct ref *ref, |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 445 | const char *remote, |
Marc Branchaud | 6da618d | 2012-04-16 18:08:49 -0400 | [diff] [blame] | 446 | const struct ref *remote_ref, |
Jeff King | 5914f2d | 2011-12-08 03:43:19 -0500 | [diff] [blame] | 447 | struct strbuf *display) |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 448 | { |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 449 | struct commit *current = NULL, *updated; |
| 450 | enum object_type type; |
| 451 | struct branch *current_branch = branch_get(NULL); |
Felipe Contreras | 4577e48 | 2009-05-14 00:22:04 +0300 | [diff] [blame] | 452 | const char *pretty_ref = prettify_refname(ref->name); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 453 | |
| 454 | type = sha1_object_info(ref->new_sha1, NULL); |
| 455 | if (type < 0) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 456 | die(_("object %s not found"), sha1_to_hex(ref->new_sha1)); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 457 | |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 458 | if (!hashcmp(ref->old_sha1, ref->new_sha1)) { |
Tuncer Ayaz | 7f87aff | 2008-11-15 01:14:24 +0100 | [diff] [blame] | 459 | if (verbosity > 0) |
Jeff King | 5914f2d | 2011-12-08 03:43:19 -0500 | [diff] [blame] | 460 | strbuf_addf(display, "= %-*s %-*s -> %s", |
Nguyễn Thái Ngọc Duy | 754395d | 2012-09-04 17:39:35 +0700 | [diff] [blame] | 461 | TRANSPORT_SUMMARY(_("[up to date]")), |
| 462 | REFCOL_WIDTH, remote, pretty_ref); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 463 | return 0; |
| 464 | } |
| 465 | |
Shawn O. Pearce | b3abdd9 | 2007-09-16 02:31:26 -0400 | [diff] [blame] | 466 | if (current_branch && |
| 467 | !strcmp(ref->name, current_branch->name) && |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 468 | !(update_head_ok || is_bare_repository()) && |
| 469 | !is_null_sha1(ref->old_sha1)) { |
| 470 | /* |
| 471 | * If this is the head, and it's not okay to update |
| 472 | * the head, and the old value of the head isn't empty... |
| 473 | */ |
Jeff King | 5914f2d | 2011-12-08 03:43:19 -0500 | [diff] [blame] | 474 | strbuf_addf(display, |
| 475 | _("! %-*s %-*s -> %s (can't fetch in current branch)"), |
Nguyễn Thái Ngọc Duy | 754395d | 2012-09-04 17:39:35 +0700 | [diff] [blame] | 476 | TRANSPORT_SUMMARY(_("[rejected]")), |
Jeff King | 5914f2d | 2011-12-08 03:43:19 -0500 | [diff] [blame] | 477 | REFCOL_WIDTH, remote, pretty_ref); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 478 | return 1; |
| 479 | } |
| 480 | |
| 481 | if (!is_null_sha1(ref->old_sha1) && |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 482 | starts_with(ref->name, "refs/tags/")) { |
Jeff King | 6315472 | 2008-06-26 23:59:50 -0400 | [diff] [blame] | 483 | int r; |
| 484 | r = s_update_ref("updating tag", ref, 0); |
Jeff King | 5914f2d | 2011-12-08 03:43:19 -0500 | [diff] [blame] | 485 | strbuf_addf(display, "%c %-*s %-*s -> %s%s", |
| 486 | r ? '!' : '-', |
Nguyễn Thái Ngọc Duy | 754395d | 2012-09-04 17:39:35 +0700 | [diff] [blame] | 487 | TRANSPORT_SUMMARY(_("[tag update]")), |
Jeff King | 5914f2d | 2011-12-08 03:43:19 -0500 | [diff] [blame] | 488 | REFCOL_WIDTH, remote, pretty_ref, |
| 489 | r ? _(" (unable to update local ref)") : ""); |
Jeff King | 6315472 | 2008-06-26 23:59:50 -0400 | [diff] [blame] | 490 | return r; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 491 | } |
| 492 | |
Shawn O. Pearce | cfa5b2b | 2007-10-19 00:54:59 -0400 | [diff] [blame] | 493 | current = lookup_commit_reference_gently(ref->old_sha1, 1); |
| 494 | updated = lookup_commit_reference_gently(ref->new_sha1, 1); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 495 | if (!current || !updated) { |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 496 | const char *msg; |
| 497 | const char *what; |
Jeff King | 6315472 | 2008-06-26 23:59:50 -0400 | [diff] [blame] | 498 | int r; |
Marc Branchaud | 0997ada | 2012-04-16 18:08:50 -0400 | [diff] [blame] | 499 | /* |
| 500 | * Nicely describe the new ref we're fetching. |
| 501 | * Base this on the remote's ref name, as it's |
| 502 | * more likely to follow a standard layout. |
| 503 | */ |
| 504 | const char *name = remote_ref ? remote_ref->name : ""; |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 505 | if (starts_with(name, "refs/tags/")) { |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 506 | msg = "storing tag"; |
Ævar Arnfjörð Bjarmason | f7b3742 | 2011-02-22 23:41:53 +0000 | [diff] [blame] | 507 | what = _("[new tag]"); |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 508 | } else if (starts_with(name, "refs/heads/")) { |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 509 | msg = "storing head"; |
Ævar Arnfjörð Bjarmason | f7b3742 | 2011-02-22 23:41:53 +0000 | [diff] [blame] | 510 | what = _("[new branch]"); |
Marc Branchaud | 0997ada | 2012-04-16 18:08:50 -0400 | [diff] [blame] | 511 | } else { |
| 512 | msg = "storing ref"; |
| 513 | what = _("[new ref]"); |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 514 | } |
| 515 | |
Jens Lehmann | a6801ad | 2012-04-13 18:25:16 +0200 | [diff] [blame] | 516 | if ((recurse_submodules != RECURSE_SUBMODULES_OFF) && |
| 517 | (recurse_submodules != RECURSE_SUBMODULES_ON)) |
| 518 | check_for_new_submodule_commits(ref->new_sha1); |
Jeff King | 6315472 | 2008-06-26 23:59:50 -0400 | [diff] [blame] | 519 | r = s_update_ref(msg, ref, 0); |
Jeff King | 5914f2d | 2011-12-08 03:43:19 -0500 | [diff] [blame] | 520 | strbuf_addf(display, "%c %-*s %-*s -> %s%s", |
| 521 | r ? '!' : '*', |
Nguyễn Thái Ngọc Duy | 754395d | 2012-09-04 17:39:35 +0700 | [diff] [blame] | 522 | TRANSPORT_SUMMARY(what), |
Jeff King | 5914f2d | 2011-12-08 03:43:19 -0500 | [diff] [blame] | 523 | REFCOL_WIDTH, remote, pretty_ref, |
| 524 | r ? _(" (unable to update local ref)") : ""); |
Jeff King | 6315472 | 2008-06-26 23:59:50 -0400 | [diff] [blame] | 525 | return r; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 526 | } |
| 527 | |
Junio C Hamano | a20efee | 2012-08-27 14:46:01 -0700 | [diff] [blame] | 528 | if (in_merge_bases(current, updated)) { |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 529 | char quickref[83]; |
Jeff King | 6315472 | 2008-06-26 23:59:50 -0400 | [diff] [blame] | 530 | int r; |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 531 | strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV)); |
| 532 | strcat(quickref, ".."); |
| 533 | strcat(quickref, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV)); |
Jens Lehmann | 88a2197 | 2011-03-06 23:10:46 +0100 | [diff] [blame] | 534 | if ((recurse_submodules != RECURSE_SUBMODULES_OFF) && |
| 535 | (recurse_submodules != RECURSE_SUBMODULES_ON)) |
| 536 | check_for_new_submodule_commits(ref->new_sha1); |
Felipe Contreras | a75d7b5 | 2009-10-24 11:31:32 +0300 | [diff] [blame] | 537 | r = s_update_ref("fast-forward", ref, 1); |
Jeff King | 5914f2d | 2011-12-08 03:43:19 -0500 | [diff] [blame] | 538 | strbuf_addf(display, "%c %-*s %-*s -> %s%s", |
| 539 | r ? '!' : ' ', |
| 540 | TRANSPORT_SUMMARY_WIDTH, quickref, |
| 541 | REFCOL_WIDTH, remote, pretty_ref, |
| 542 | r ? _(" (unable to update local ref)") : ""); |
Jeff King | 6315472 | 2008-06-26 23:59:50 -0400 | [diff] [blame] | 543 | return r; |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 544 | } else if (force || ref->force) { |
| 545 | char quickref[84]; |
Jeff King | 6315472 | 2008-06-26 23:59:50 -0400 | [diff] [blame] | 546 | int r; |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 547 | strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV)); |
| 548 | strcat(quickref, "..."); |
| 549 | strcat(quickref, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV)); |
Jens Lehmann | 88a2197 | 2011-03-06 23:10:46 +0100 | [diff] [blame] | 550 | if ((recurse_submodules != RECURSE_SUBMODULES_OFF) && |
| 551 | (recurse_submodules != RECURSE_SUBMODULES_ON)) |
| 552 | check_for_new_submodule_commits(ref->new_sha1); |
Jeff King | 6315472 | 2008-06-26 23:59:50 -0400 | [diff] [blame] | 553 | r = s_update_ref("forced-update", ref, 1); |
Jeff King | 5914f2d | 2011-12-08 03:43:19 -0500 | [diff] [blame] | 554 | strbuf_addf(display, "%c %-*s %-*s -> %s (%s)", |
| 555 | r ? '!' : '+', |
| 556 | TRANSPORT_SUMMARY_WIDTH, quickref, |
| 557 | REFCOL_WIDTH, remote, pretty_ref, |
| 558 | r ? _("unable to update local ref") : _("forced update")); |
Jeff King | 6315472 | 2008-06-26 23:59:50 -0400 | [diff] [blame] | 559 | return r; |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 560 | } else { |
Jeff King | 5914f2d | 2011-12-08 03:43:19 -0500 | [diff] [blame] | 561 | strbuf_addf(display, "! %-*s %-*s -> %s %s", |
Nguyễn Thái Ngọc Duy | 754395d | 2012-09-04 17:39:35 +0700 | [diff] [blame] | 562 | TRANSPORT_SUMMARY(_("[rejected]")), |
Jeff King | 5914f2d | 2011-12-08 03:43:19 -0500 | [diff] [blame] | 563 | REFCOL_WIDTH, remote, pretty_ref, |
| 564 | _("(non-fast-forward)")); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 565 | return 1; |
| 566 | } |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 567 | } |
| 568 | |
Junio C Hamano | f0e278b | 2011-09-02 16:22:47 -0700 | [diff] [blame] | 569 | static int iterate_ref_map(void *cb_data, unsigned char sha1[20]) |
Junio C Hamano | 6b67e0d | 2011-09-01 15:43:35 -0700 | [diff] [blame] | 570 | { |
Junio C Hamano | f0e278b | 2011-09-02 16:22:47 -0700 | [diff] [blame] | 571 | struct ref **rm = cb_data; |
| 572 | struct ref *ref = *rm; |
Junio C Hamano | 6b67e0d | 2011-09-01 15:43:35 -0700 | [diff] [blame] | 573 | |
Nguyễn Thái Ngọc Duy | 4820a33 | 2013-12-05 20:02:40 +0700 | [diff] [blame] | 574 | while (ref && ref->status == REF_STATUS_REJECT_SHALLOW) |
| 575 | ref = ref->next; |
Junio C Hamano | f0e278b | 2011-09-02 16:22:47 -0700 | [diff] [blame] | 576 | if (!ref) |
| 577 | return -1; /* end of the list */ |
| 578 | *rm = ref->next; |
| 579 | hashcpy(sha1, ref->old_sha1); |
| 580 | return 0; |
Junio C Hamano | 6b67e0d | 2011-09-01 15:43:35 -0700 | [diff] [blame] | 581 | } |
| 582 | |
Andreas Ericsson | 47abd85 | 2009-04-17 10:20:11 +0200 | [diff] [blame] | 583 | static int store_updated_refs(const char *raw_url, const char *remote_name, |
Jeff King | f3cb169 | 2008-06-27 00:01:41 -0400 | [diff] [blame] | 584 | struct ref *ref_map) |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 585 | { |
| 586 | FILE *fp; |
| 587 | struct commit *commit; |
Tom Miller | 4b3b33a | 2014-01-02 20:28:51 -0600 | [diff] [blame] | 588 | int url_len, i, rc = 0; |
Jeff King | 5914f2d | 2011-12-08 03:43:19 -0500 | [diff] [blame] | 589 | struct strbuf note = STRBUF_INIT; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 590 | const char *what, *kind; |
| 591 | struct ref *rm; |
Jay Soffian | 28a1540 | 2009-11-10 09:19:43 +0100 | [diff] [blame] | 592 | char *url, *filename = dry_run ? "/dev/null" : git_path("FETCH_HEAD"); |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 593 | int want_status; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 594 | |
André Goddard Rosa | d6617c7 | 2007-11-22 20:22:23 -0200 | [diff] [blame] | 595 | fp = fopen(filename, "a"); |
| 596 | if (!fp) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 597 | return error(_("cannot open %s: %s\n"), filename, strerror(errno)); |
Andreas Ericsson | 47abd85 | 2009-04-17 10:20:11 +0200 | [diff] [blame] | 598 | |
Daniel Barkalow | fb0cc87 | 2009-11-18 02:42:22 +0100 | [diff] [blame] | 599 | if (raw_url) |
| 600 | url = transport_anonymize_url(raw_url); |
| 601 | else |
| 602 | url = xstrdup("foreign"); |
Junio C Hamano | 6b67e0d | 2011-09-01 15:43:35 -0700 | [diff] [blame] | 603 | |
Junio C Hamano | f0e278b | 2011-09-02 16:22:47 -0700 | [diff] [blame] | 604 | rm = ref_map; |
Junio C Hamano | 3f7d11c | 2011-10-17 21:37:12 -0700 | [diff] [blame] | 605 | if (check_everything_connected(iterate_ref_map, 0, &rm)) { |
Tay Ray Chuan | 9516a59 | 2011-10-07 15:40:22 +0800 | [diff] [blame] | 606 | rc = error(_("%s did not send all necessary objects\n"), url); |
| 607 | goto abort; |
| 608 | } |
Junio C Hamano | 6b67e0d | 2011-09-01 15:43:35 -0700 | [diff] [blame] | 609 | |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 610 | /* |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 611 | * We do a pass for each fetch_head_status type in their enum order, so |
| 612 | * merged entries are written before not-for-merge. That lets readers |
| 613 | * use FETCH_HEAD as a refname to refer to the ref to be merged. |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 614 | */ |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 615 | for (want_status = FETCH_HEAD_MERGE; |
| 616 | want_status <= FETCH_HEAD_IGNORE; |
| 617 | want_status++) { |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 618 | for (rm = ref_map; rm; rm = rm->next) { |
| 619 | struct ref *ref = NULL; |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 620 | const char *merge_status_marker = ""; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 621 | |
Nguyễn Thái Ngọc Duy | 4820a33 | 2013-12-05 20:02:40 +0700 | [diff] [blame] | 622 | if (rm->status == REF_STATUS_REJECT_SHALLOW) { |
| 623 | if (want_status == FETCH_HEAD_MERGE) |
| 624 | warning(_("reject %s because shallow roots are not allowed to be updated"), |
| 625 | rm->peer_ref ? rm->peer_ref->name : rm->name); |
| 626 | continue; |
| 627 | } |
| 628 | |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 629 | commit = lookup_commit_reference_gently(rm->old_sha1, 1); |
| 630 | if (!commit) |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 631 | rm->fetch_head_status = FETCH_HEAD_NOT_FOR_MERGE; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 632 | |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 633 | if (rm->fetch_head_status != want_status) |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 634 | continue; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 635 | |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 636 | if (rm->peer_ref) { |
| 637 | ref = xcalloc(1, sizeof(*ref) + strlen(rm->peer_ref->name) + 1); |
| 638 | strcpy(ref->name, rm->peer_ref->name); |
| 639 | hashcpy(ref->old_sha1, rm->peer_ref->old_sha1); |
| 640 | hashcpy(ref->new_sha1, rm->old_sha1); |
| 641 | ref->force = rm->peer_ref->force; |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 642 | } |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 643 | |
| 644 | |
| 645 | if (!strcmp(rm->name, "HEAD")) { |
| 646 | kind = ""; |
| 647 | what = ""; |
| 648 | } |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 649 | else if (starts_with(rm->name, "refs/heads/")) { |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 650 | kind = "branch"; |
| 651 | what = rm->name + 11; |
| 652 | } |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 653 | else if (starts_with(rm->name, "refs/tags/")) { |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 654 | kind = "tag"; |
| 655 | what = rm->name + 10; |
| 656 | } |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 657 | else if (starts_with(rm->name, "refs/remotes/")) { |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 658 | kind = "remote-tracking branch"; |
| 659 | what = rm->name + 13; |
| 660 | } |
| 661 | else { |
| 662 | kind = ""; |
| 663 | what = rm->name; |
| 664 | } |
| 665 | |
| 666 | url_len = strlen(url); |
| 667 | for (i = url_len - 1; url[i] == '/' && 0 <= i; i--) |
| 668 | ; |
| 669 | url_len = i + 1; |
| 670 | if (4 < i && !strncmp(".git", url + i - 3, 4)) |
| 671 | url_len = i - 3; |
| 672 | |
| 673 | strbuf_reset(¬e); |
| 674 | if (*what) { |
| 675 | if (*kind) |
| 676 | strbuf_addf(¬e, "%s ", kind); |
| 677 | strbuf_addf(¬e, "'%s' of ", what); |
| 678 | } |
Jeff King | 900f281 | 2013-05-11 18:15:59 +0200 | [diff] [blame] | 679 | switch (rm->fetch_head_status) { |
| 680 | case FETCH_HEAD_NOT_FOR_MERGE: |
| 681 | merge_status_marker = "not-for-merge"; |
| 682 | /* fall-through */ |
| 683 | case FETCH_HEAD_MERGE: |
| 684 | fprintf(fp, "%s\t%s\t%s", |
| 685 | sha1_to_hex(rm->old_sha1), |
| 686 | merge_status_marker, |
| 687 | note.buf); |
| 688 | for (i = 0; i < url_len; ++i) |
| 689 | if ('\n' == url[i]) |
| 690 | fputs("\\n", fp); |
| 691 | else |
| 692 | fputc(url[i], fp); |
| 693 | fputc('\n', fp); |
| 694 | break; |
| 695 | default: |
| 696 | /* do not write anything to FETCH_HEAD */ |
| 697 | break; |
| 698 | } |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 699 | |
| 700 | strbuf_reset(¬e); |
| 701 | if (ref) { |
Marc Branchaud | 6da618d | 2012-04-16 18:08:49 -0400 | [diff] [blame] | 702 | rc |= update_local_ref(ref, what, rm, ¬e); |
Joey Hess | 96890f4 | 2011-12-26 12:16:56 -0400 | [diff] [blame] | 703 | free(ref); |
| 704 | } else |
| 705 | strbuf_addf(¬e, "* %-*s %-*s -> FETCH_HEAD", |
| 706 | TRANSPORT_SUMMARY_WIDTH, |
| 707 | *kind ? kind : "branch", |
| 708 | REFCOL_WIDTH, |
| 709 | *what ? what : "HEAD"); |
| 710 | if (note.len) { |
| 711 | if (verbosity >= 0 && !shown_url) { |
| 712 | fprintf(stderr, _("From %.*s\n"), |
| 713 | url_len, url); |
| 714 | shown_url = 1; |
| 715 | } |
| 716 | if (verbosity >= 0) |
| 717 | fprintf(stderr, " %s\n", note.buf); |
| 718 | } |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 719 | } |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 720 | } |
Tay Ray Chuan | 9516a59 | 2011-10-07 15:40:22 +0800 | [diff] [blame] | 721 | |
Jeff King | fa25075 | 2009-05-25 06:40:54 -0400 | [diff] [blame] | 722 | if (rc & STORE_REF_ERROR_DF_CONFLICT) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 723 | error(_("some local refs could not be updated; try running\n" |
Jeff King | f3cb169 | 2008-06-27 00:01:41 -0400 | [diff] [blame] | 724 | " 'git remote prune %s' to remove any old, conflicting " |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 725 | "branches"), remote_name); |
Tay Ray Chuan | 9516a59 | 2011-10-07 15:40:22 +0800 | [diff] [blame] | 726 | |
| 727 | abort: |
Jeff King | 5914f2d | 2011-12-08 03:43:19 -0500 | [diff] [blame] | 728 | strbuf_release(¬e); |
Tay Ray Chuan | 9516a59 | 2011-10-07 15:40:22 +0800 | [diff] [blame] | 729 | free(url); |
| 730 | fclose(fp); |
Dmitry V. Levin | efb98b4 | 2008-05-28 19:29:36 +0400 | [diff] [blame] | 731 | return rc; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 732 | } |
| 733 | |
Shawn O. Pearce | 4191c35 | 2007-11-11 02:29:47 -0500 | [diff] [blame] | 734 | /* |
| 735 | * We would want to bypass the object transfer altogether if |
Johan Herland | d9eb020 | 2009-07-10 01:52:30 +0200 | [diff] [blame] | 736 | * everything we are going to fetch already exists and is connected |
Shawn O. Pearce | 4191c35 | 2007-11-11 02:29:47 -0500 | [diff] [blame] | 737 | * locally. |
Shawn O. Pearce | 4191c35 | 2007-11-11 02:29:47 -0500 | [diff] [blame] | 738 | */ |
| 739 | static int quickfetch(struct ref *ref_map) |
| 740 | { |
Junio C Hamano | f0e278b | 2011-09-02 16:22:47 -0700 | [diff] [blame] | 741 | struct ref *rm = ref_map; |
| 742 | |
Shawn O. Pearce | 4191c35 | 2007-11-11 02:29:47 -0500 | [diff] [blame] | 743 | /* |
| 744 | * If we are deepening a shallow clone we already have these |
| 745 | * objects reachable. Running rev-list here will return with |
| 746 | * a good (0) exit status and we'll bypass the fetch that we |
| 747 | * really need to perform. Claiming failure now will ensure |
| 748 | * we perform the network exchange to deepen our history. |
| 749 | */ |
| 750 | if (depth) |
| 751 | return -1; |
Junio C Hamano | f0e278b | 2011-09-02 16:22:47 -0700 | [diff] [blame] | 752 | return check_everything_connected(iterate_ref_map, 1, &rm); |
Shawn O. Pearce | 4191c35 | 2007-11-11 02:29:47 -0500 | [diff] [blame] | 753 | } |
| 754 | |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 755 | static int fetch_refs(struct transport *transport, struct ref *ref_map) |
| 756 | { |
Shawn O. Pearce | 4191c35 | 2007-11-11 02:29:47 -0500 | [diff] [blame] | 757 | int ret = quickfetch(ref_map); |
| 758 | if (ret) |
| 759 | ret = transport_fetch_refs(transport, ref_map); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 760 | if (!ret) |
Jeff King | f3cb169 | 2008-06-27 00:01:41 -0400 | [diff] [blame] | 761 | ret |= store_updated_refs(transport->url, |
| 762 | transport->remote->name, |
| 763 | ref_map); |
Shawn O. Pearce | 1788c39 | 2007-09-14 03:31:23 -0400 | [diff] [blame] | 764 | transport_unlock_pack(transport); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 765 | return ret; |
| 766 | } |
| 767 | |
Tom Miller | 4b3b33a | 2014-01-02 20:28:51 -0600 | [diff] [blame] | 768 | static int prune_refs(struct refspec *refs, int ref_count, struct ref *ref_map, |
| 769 | const char *raw_url) |
Jay Soffian | f360d84 | 2009-11-10 09:15:47 +0100 | [diff] [blame] | 770 | { |
Tom Miller | 4b3b33a | 2014-01-02 20:28:51 -0600 | [diff] [blame] | 771 | int url_len, i, result = 0; |
Carlos Martín Nieto | ed43de6 | 2011-10-15 07:04:25 +0200 | [diff] [blame] | 772 | struct ref *ref, *stale_refs = get_stale_heads(refs, ref_count, ref_map); |
Tom Miller | 4b3b33a | 2014-01-02 20:28:51 -0600 | [diff] [blame] | 773 | char *url; |
Jay Soffian | f360d84 | 2009-11-10 09:15:47 +0100 | [diff] [blame] | 774 | const char *dangling_msg = dry_run |
Nguyễn Thái Ngọc Duy | 18986d5 | 2012-04-23 19:30:25 +0700 | [diff] [blame] | 775 | ? _(" (%s will become dangling)") |
| 776 | : _(" (%s has become dangling)"); |
Jay Soffian | f360d84 | 2009-11-10 09:15:47 +0100 | [diff] [blame] | 777 | |
Tom Miller | 4b3b33a | 2014-01-02 20:28:51 -0600 | [diff] [blame] | 778 | if (raw_url) |
| 779 | url = transport_anonymize_url(raw_url); |
| 780 | else |
| 781 | url = xstrdup("foreign"); |
| 782 | |
| 783 | url_len = strlen(url); |
| 784 | for (i = url_len - 1; url[i] == '/' && 0 <= i; i--) |
| 785 | ; |
| 786 | |
| 787 | url_len = i + 1; |
| 788 | if (4 < i && !strncmp(".git", url + i - 3, 4)) |
| 789 | url_len = i - 3; |
| 790 | |
Jay Soffian | f360d84 | 2009-11-10 09:15:47 +0100 | [diff] [blame] | 791 | for (ref = stale_refs; ref; ref = ref->next) { |
| 792 | if (!dry_run) |
| 793 | result |= delete_ref(ref->name, NULL, 0); |
Tom Miller | 4b3b33a | 2014-01-02 20:28:51 -0600 | [diff] [blame] | 794 | if (verbosity >= 0 && !shown_url) { |
| 795 | fprintf(stderr, _("From %.*s\n"), url_len, url); |
| 796 | shown_url = 1; |
| 797 | } |
Jay Soffian | f360d84 | 2009-11-10 09:15:47 +0100 | [diff] [blame] | 798 | if (verbosity >= 0) { |
| 799 | fprintf(stderr, " x %-*s %-*s -> %s\n", |
Nguyễn Thái Ngọc Duy | 754395d | 2012-09-04 17:39:35 +0700 | [diff] [blame] | 800 | TRANSPORT_SUMMARY(_("[deleted]")), |
Ævar Arnfjörð Bjarmason | 502681c | 2011-02-22 23:41:52 +0000 | [diff] [blame] | 801 | REFCOL_WIDTH, _("(none)"), prettify_refname(ref->name)); |
Jay Soffian | f360d84 | 2009-11-10 09:15:47 +0100 | [diff] [blame] | 802 | warn_dangling_symref(stderr, dangling_msg, ref->name); |
| 803 | } |
| 804 | } |
Tom Miller | 4b3b33a | 2014-01-02 20:28:51 -0600 | [diff] [blame] | 805 | free(url); |
Jay Soffian | f360d84 | 2009-11-10 09:15:47 +0100 | [diff] [blame] | 806 | free_refs(stale_refs); |
| 807 | return result; |
| 808 | } |
| 809 | |
Johannes Schindelin | 8ee5d73 | 2008-10-13 11:36:52 +0200 | [diff] [blame] | 810 | static void check_not_current_branch(struct ref *ref_map) |
| 811 | { |
| 812 | struct branch *current_branch = branch_get(NULL); |
| 813 | |
| 814 | if (is_bare_repository() || !current_branch) |
| 815 | return; |
| 816 | |
| 817 | for (; ref_map; ref_map = ref_map->next) |
| 818 | if (ref_map->peer_ref && !strcmp(current_branch->refname, |
| 819 | ref_map->peer_ref->name)) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 820 | die(_("Refusing to fetch into current branch %s " |
| 821 | "of non-bare repository"), current_branch->refname); |
Johannes Schindelin | 8ee5d73 | 2008-10-13 11:36:52 +0200 | [diff] [blame] | 822 | } |
| 823 | |
Junio C Hamano | e6cc510 | 2010-02-24 11:02:05 -0800 | [diff] [blame] | 824 | static int truncate_fetch_head(void) |
| 825 | { |
| 826 | char *filename = git_path("FETCH_HEAD"); |
| 827 | FILE *fp = fopen(filename, "w"); |
| 828 | |
| 829 | if (!fp) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 830 | return error(_("cannot open %s: %s\n"), filename, strerror(errno)); |
Junio C Hamano | e6cc510 | 2010-02-24 11:02:05 -0800 | [diff] [blame] | 831 | fclose(fp); |
| 832 | return 0; |
| 833 | } |
| 834 | |
Junio C Hamano | db5723c | 2013-08-07 14:43:20 -0700 | [diff] [blame] | 835 | static void set_option(struct transport *transport, const char *name, const char *value) |
| 836 | { |
| 837 | int r = transport_set_option(transport, name, value); |
| 838 | if (r < 0) |
| 839 | die(_("Option \"%s\" value \"%s\" is not valid for %s"), |
| 840 | name, value, transport->url); |
| 841 | if (r > 0) |
| 842 | warning(_("Option \"%s\" is ignored for %s\n"), |
| 843 | name, transport->url); |
| 844 | } |
| 845 | |
Ramsay Jones | 0f73f8b | 2013-08-28 19:56:17 +0100 | [diff] [blame] | 846 | static struct transport *prepare_transport(struct remote *remote) |
Junio C Hamano | db5723c | 2013-08-07 14:43:20 -0700 | [diff] [blame] | 847 | { |
| 848 | struct transport *transport; |
| 849 | transport = transport_get(remote, NULL); |
| 850 | transport_set_verbosity(transport, verbosity, progress); |
| 851 | if (upload_pack) |
| 852 | set_option(transport, TRANS_OPT_UPLOADPACK, upload_pack); |
| 853 | if (keep) |
| 854 | set_option(transport, TRANS_OPT_KEEP, "yes"); |
| 855 | if (depth) |
| 856 | set_option(transport, TRANS_OPT_DEPTH, depth); |
Nguyễn Thái Ngọc Duy | 48d25ca | 2013-12-05 20:02:42 +0700 | [diff] [blame] | 857 | if (update_shallow) |
| 858 | set_option(transport, TRANS_OPT_UPDATE_SHALLOW, "yes"); |
Junio C Hamano | db5723c | 2013-08-07 14:43:20 -0700 | [diff] [blame] | 859 | return transport; |
| 860 | } |
| 861 | |
Junio C Hamano | 069d503 | 2013-08-07 15:14:45 -0700 | [diff] [blame] | 862 | static void backfill_tags(struct transport *transport, struct ref *ref_map) |
| 863 | { |
Junio C Hamano | b26ed43 | 2013-08-07 15:47:18 -0700 | [diff] [blame] | 864 | if (transport->cannot_reuse) { |
| 865 | gsecondary = prepare_transport(transport->remote); |
| 866 | transport = gsecondary; |
| 867 | } |
| 868 | |
Junio C Hamano | 069d503 | 2013-08-07 15:14:45 -0700 | [diff] [blame] | 869 | transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL); |
| 870 | transport_set_option(transport, TRANS_OPT_DEPTH, "0"); |
| 871 | fetch_refs(transport, ref_map); |
Junio C Hamano | b26ed43 | 2013-08-07 15:47:18 -0700 | [diff] [blame] | 872 | |
| 873 | if (gsecondary) { |
| 874 | transport_disconnect(gsecondary); |
| 875 | gsecondary = NULL; |
| 876 | } |
Junio C Hamano | 069d503 | 2013-08-07 15:14:45 -0700 | [diff] [blame] | 877 | } |
| 878 | |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 879 | static int do_fetch(struct transport *transport, |
| 880 | struct refspec *refs, int ref_count) |
| 881 | { |
Michael Haggerty | b87dbcc | 2013-05-25 11:08:01 +0200 | [diff] [blame] | 882 | struct string_list existing_refs = STRING_LIST_INIT_DUP; |
Shawn O. Pearce | 7f98428 | 2008-03-02 21:34:43 -0500 | [diff] [blame] | 883 | struct ref *ref_map; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 884 | struct ref *rm; |
| 885 | int autotags = (transport->remote->fetch_tags == 1); |
Michael Haggerty | 5b87d8d | 2013-05-25 11:08:16 +0200 | [diff] [blame] | 886 | int retcode = 0; |
Julian Phillips | b1a01e1 | 2009-10-25 21:28:12 +0000 | [diff] [blame] | 887 | |
| 888 | for_each_ref(add_existing, &existing_refs); |
| 889 | |
Daniel Johnson | ed36854 | 2010-08-11 18:57:20 -0400 | [diff] [blame] | 890 | if (tags == TAGS_DEFAULT) { |
| 891 | if (transport->remote->fetch_tags == 2) |
| 892 | tags = TAGS_SET; |
| 893 | if (transport->remote->fetch_tags == -1) |
| 894 | tags = TAGS_UNSET; |
| 895 | } |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 896 | |
Shawn O. Pearce | 824d577 | 2007-09-19 00:49:31 -0400 | [diff] [blame] | 897 | if (!transport->get_refs_list || !transport->fetch) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 898 | die(_("Don't know how to fetch from %s"), transport->url); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 899 | |
| 900 | /* if not appending, truncate FETCH_HEAD */ |
Jay Soffian | 28a1540 | 2009-11-10 09:19:43 +0100 | [diff] [blame] | 901 | if (!append && !dry_run) { |
Michael Haggerty | 5b87d8d | 2013-05-25 11:08:16 +0200 | [diff] [blame] | 902 | retcode = truncate_fetch_head(); |
| 903 | if (retcode) |
| 904 | goto cleanup; |
André Goddard Rosa | d6617c7 | 2007-11-22 20:22:23 -0200 | [diff] [blame] | 905 | } |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 906 | |
| 907 | ref_map = get_ref_map(transport, refs, ref_count, tags, &autotags); |
Johannes Schindelin | 8ee5d73 | 2008-10-13 11:36:52 +0200 | [diff] [blame] | 908 | if (!update_head_ok) |
| 909 | check_not_current_branch(ref_map); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 910 | |
| 911 | for (rm = ref_map; rm; rm = rm->next) { |
Julian Phillips | b1a01e1 | 2009-10-25 21:28:12 +0000 | [diff] [blame] | 912 | if (rm->peer_ref) { |
Michael Haggerty | 6f64a16 | 2013-05-25 11:08:15 +0200 | [diff] [blame] | 913 | struct string_list_item *peer_item = |
| 914 | string_list_lookup(&existing_refs, |
| 915 | rm->peer_ref->name); |
Julian Phillips | b1a01e1 | 2009-10-25 21:28:12 +0000 | [diff] [blame] | 916 | if (peer_item) |
| 917 | hashcpy(rm->peer_ref->old_sha1, |
| 918 | peer_item->util); |
| 919 | } |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 920 | } |
| 921 | |
Shawn O. Pearce | 41fa7d2 | 2008-03-03 22:27:40 -0500 | [diff] [blame] | 922 | if (tags == TAGS_DEFAULT && autotags) |
| 923 | transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1"); |
Carlos Martín Nieto | ed43de6 | 2011-10-15 07:04:25 +0200 | [diff] [blame] | 924 | if (prune) { |
Michael Haggerty | 0838bf4 | 2013-10-30 06:33:00 +0100 | [diff] [blame] | 925 | /* |
| 926 | * We only prune based on refspecs specified |
| 927 | * explicitly (via command line or configuration); we |
| 928 | * don't care whether --tags was specified. |
| 929 | */ |
Michael Haggerty | c5a84e9 | 2013-10-30 06:32:59 +0100 | [diff] [blame] | 930 | if (ref_count) { |
Tom Miller | 4b3b33a | 2014-01-02 20:28:51 -0600 | [diff] [blame] | 931 | prune_refs(refs, ref_count, ref_map, transport->url); |
Michael Haggerty | c5a84e9 | 2013-10-30 06:32:59 +0100 | [diff] [blame] | 932 | } else { |
Michael Haggerty | 0838bf4 | 2013-10-30 06:33:00 +0100 | [diff] [blame] | 933 | prune_refs(transport->remote->fetch, |
| 934 | transport->remote->fetch_refspec_nr, |
Tom Miller | 4b3b33a | 2014-01-02 20:28:51 -0600 | [diff] [blame] | 935 | ref_map, |
| 936 | transport->url); |
Carlos Martín Nieto | e8c1e6c | 2011-10-15 07:04:26 +0200 | [diff] [blame] | 937 | } |
Carlos Martín Nieto | ed43de6 | 2011-10-15 07:04:25 +0200 | [diff] [blame] | 938 | } |
Tom Miller | 10a6cc8 | 2014-01-02 20:28:52 -0600 | [diff] [blame] | 939 | if (fetch_refs(transport, ref_map)) { |
| 940 | free_refs(ref_map); |
| 941 | retcode = 1; |
| 942 | goto cleanup; |
| 943 | } |
Shawn O. Pearce | 7f98428 | 2008-03-02 21:34:43 -0500 | [diff] [blame] | 944 | free_refs(ref_map); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 945 | |
| 946 | /* if neither --no-tags nor --tags was specified, do automated tag |
| 947 | * following ... */ |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 948 | if (tags == TAGS_DEFAULT && autotags) { |
Shawn O. Pearce | c50b2b4 | 2008-03-02 21:35:00 -0500 | [diff] [blame] | 949 | struct ref **tail = &ref_map; |
| 950 | ref_map = NULL; |
| 951 | find_non_local_tags(transport, &ref_map, &tail); |
Junio C Hamano | 069d503 | 2013-08-07 15:14:45 -0700 | [diff] [blame] | 952 | if (ref_map) |
| 953 | backfill_tags(transport, ref_map); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 954 | free_refs(ref_map); |
| 955 | } |
| 956 | |
Michael Haggerty | 5b87d8d | 2013-05-25 11:08:16 +0200 | [diff] [blame] | 957 | cleanup: |
Michael Haggerty | f83918e | 2013-05-25 11:08:17 +0200 | [diff] [blame] | 958 | string_list_clear(&existing_refs, 1); |
Michael Haggerty | 5b87d8d | 2013-05-25 11:08:16 +0200 | [diff] [blame] | 959 | return retcode; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 960 | } |
| 961 | |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 962 | static int get_one_remote_for_fetch(struct remote *remote, void *priv) |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 963 | { |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 964 | struct string_list *list = priv; |
Björn Gustavsson | 7cc91a2 | 2009-11-09 21:11:06 +0100 | [diff] [blame] | 965 | if (!remote->skip_default_update) |
Julian Phillips | 1d2f80f | 2010-06-26 00:41:38 +0100 | [diff] [blame] | 966 | string_list_append(list, remote->name); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 967 | return 0; |
| 968 | } |
| 969 | |
| 970 | struct remote_group_data { |
| 971 | const char *name; |
| 972 | struct string_list *list; |
| 973 | }; |
| 974 | |
| 975 | static int get_remote_group(const char *key, const char *value, void *priv) |
| 976 | { |
| 977 | struct remote_group_data *g = priv; |
| 978 | |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 979 | if (starts_with(key, "remotes.") && |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 980 | !strcmp(key + 8, g->name)) { |
| 981 | /* split list by white space */ |
| 982 | int space = strcspn(value, " \t\n"); |
| 983 | while (*value) { |
| 984 | if (space > 1) { |
Julian Phillips | 1d2f80f | 2010-06-26 00:41:38 +0100 | [diff] [blame] | 985 | string_list_append(g->list, |
| 986 | xstrndup(value, space)); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 987 | } |
| 988 | value += space + (value[space] != '\0'); |
| 989 | space = strcspn(value, " \t\n"); |
| 990 | } |
| 991 | } |
| 992 | |
| 993 | return 0; |
| 994 | } |
| 995 | |
| 996 | static int add_remote_or_group(const char *name, struct string_list *list) |
| 997 | { |
| 998 | int prev_nr = list->nr; |
Gary V. Vaughan | 66dbfd5 | 2010-05-14 09:31:33 +0000 | [diff] [blame] | 999 | struct remote_group_data g; |
| 1000 | g.name = name; g.list = list; |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1001 | |
| 1002 | git_config(get_remote_group, &g); |
| 1003 | if (list->nr == prev_nr) { |
| 1004 | struct remote *remote; |
| 1005 | if (!remote_is_configured(name)) |
| 1006 | return 0; |
| 1007 | remote = remote_get(name); |
Julian Phillips | 1d2f80f | 2010-06-26 00:41:38 +0100 | [diff] [blame] | 1008 | string_list_append(list, remote->name); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1009 | } |
| 1010 | return 1; |
| 1011 | } |
| 1012 | |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 1013 | static void add_options_to_argv(struct argv_array *argv) |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 1014 | { |
| 1015 | if (dry_run) |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 1016 | argv_array_push(argv, "--dry-run"); |
Michael Haggerty | 90765fa | 2013-10-30 06:33:04 +0100 | [diff] [blame] | 1017 | if (prune != -1) |
| 1018 | argv_array_push(argv, prune ? "--prune" : "--no-prune"); |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 1019 | if (update_head_ok) |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 1020 | argv_array_push(argv, "--update-head-ok"); |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 1021 | if (force) |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 1022 | argv_array_push(argv, "--force"); |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 1023 | if (keep) |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 1024 | argv_array_push(argv, "--keep"); |
Jens Lehmann | be254a0 | 2010-11-11 00:55:02 +0100 | [diff] [blame] | 1025 | if (recurse_submodules == RECURSE_SUBMODULES_ON) |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 1026 | argv_array_push(argv, "--recurse-submodules"); |
Jens Lehmann | 8f0700d | 2011-03-06 23:11:21 +0100 | [diff] [blame] | 1027 | else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND) |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 1028 | argv_array_push(argv, "--recurse-submodules=on-demand"); |
Dan Johnson | 8556646 | 2012-09-05 17:22:19 -0400 | [diff] [blame] | 1029 | if (tags == TAGS_SET) |
| 1030 | argv_array_push(argv, "--tags"); |
| 1031 | else if (tags == TAGS_UNSET) |
| 1032 | argv_array_push(argv, "--no-tags"); |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 1033 | if (verbosity >= 2) |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 1034 | argv_array_push(argv, "-v"); |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 1035 | if (verbosity >= 1) |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 1036 | argv_array_push(argv, "-v"); |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 1037 | else if (verbosity < 0) |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 1038 | argv_array_push(argv, "-q"); |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 1039 | |
| 1040 | } |
| 1041 | |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1042 | static int fetch_multiple(struct string_list *list) |
| 1043 | { |
| 1044 | int i, result = 0; |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 1045 | struct argv_array argv = ARGV_ARRAY_INIT; |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1046 | |
Junio C Hamano | e6cc510 | 2010-02-24 11:02:05 -0800 | [diff] [blame] | 1047 | if (!append && !dry_run) { |
| 1048 | int errcode = truncate_fetch_head(); |
| 1049 | if (errcode) |
| 1050 | return errcode; |
| 1051 | } |
| 1052 | |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 1053 | argv_array_pushl(&argv, "fetch", "--append", NULL); |
| 1054 | add_options_to_argv(&argv); |
| 1055 | |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1056 | for (i = 0; i < list->nr; i++) { |
| 1057 | const char *name = list->items[i].string; |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 1058 | argv_array_push(&argv, name); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1059 | if (verbosity >= 0) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 1060 | printf(_("Fetching %s\n"), name); |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 1061 | if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) { |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 1062 | error(_("Could not fetch %s"), name); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1063 | result = 1; |
| 1064 | } |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 1065 | argv_array_pop(&argv); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1066 | } |
| 1067 | |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 1068 | argv_array_clear(&argv); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1069 | return result; |
| 1070 | } |
| 1071 | |
| 1072 | static int fetch_one(struct remote *remote, int argc, const char **argv) |
| 1073 | { |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1074 | static const char **refs = NULL; |
Jim Meyering | d8ead15 | 2011-06-08 22:06:33 +0200 | [diff] [blame] | 1075 | struct refspec *refspec; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1076 | int ref_nr = 0; |
Alex Riesen | 7b7f39e | 2008-04-28 22:23:35 +0200 | [diff] [blame] | 1077 | int exit_code; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1078 | |
Daniel Barkalow | fa685bd | 2009-03-11 01:47:20 -0400 | [diff] [blame] | 1079 | if (!remote) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 1080 | die(_("No remote repository specified. Please, specify either a URL or a\n" |
| 1081 | "remote name from which new revisions should be fetched.")); |
Daniel Barkalow | fa685bd | 2009-03-11 01:47:20 -0400 | [diff] [blame] | 1082 | |
Junio C Hamano | db5723c | 2013-08-07 14:43:20 -0700 | [diff] [blame] | 1083 | gtransport = prepare_transport(remote); |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 1084 | |
| 1085 | if (prune < 0) { |
| 1086 | /* no command line request */ |
Junio C Hamano | 20419de | 2013-09-09 14:50:37 -0700 | [diff] [blame] | 1087 | if (0 <= gtransport->remote->prune) |
| 1088 | prune = gtransport->remote->prune; |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 1089 | else if (0 <= fetch_prune_config) |
| 1090 | prune = fetch_prune_config; |
| 1091 | else |
| 1092 | prune = PRUNE_BY_DEFAULT; |
| 1093 | } |
| 1094 | |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1095 | if (argc > 0) { |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1096 | int j = 0; |
Elia Pinto | bf7e645 | 2014-01-29 08:54:16 -0800 | [diff] [blame] | 1097 | int i; |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 1098 | refs = xcalloc(argc + 1, sizeof(const char *)); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1099 | for (i = 0; i < argc; i++) { |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1100 | if (!strcmp(argv[i], "tag")) { |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1101 | i++; |
Kevin Ballard | f53423b | 2008-04-05 14:28:53 -0400 | [diff] [blame] | 1102 | if (i >= argc) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 1103 | die(_("You need to specify a tag name.")); |
Jeff King | b2724c8 | 2014-06-19 17:26:56 -0400 | [diff] [blame] | 1104 | refs[j++] = xstrfmt("refs/tags/%s:refs/tags/%s", |
| 1105 | argv[i], argv[i]); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1106 | } else |
| 1107 | refs[j++] = argv[i]; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1108 | } |
| 1109 | refs[j] = NULL; |
| 1110 | ref_nr = j; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1111 | } |
| 1112 | |
Jeff King | 57b235a | 2009-01-22 01:03:08 -0500 | [diff] [blame] | 1113 | sigchain_push_common(unlock_pack_on_signal); |
Shawn O. Pearce | e4022ed | 2007-09-14 03:31:25 -0400 | [diff] [blame] | 1114 | atexit(unlock_pack); |
Jim Meyering | d8ead15 | 2011-06-08 22:06:33 +0200 | [diff] [blame] | 1115 | refspec = parse_fetch_refspec(ref_nr, refs); |
Junio C Hamano | af23445 | 2013-08-07 15:38:45 -0700 | [diff] [blame] | 1116 | exit_code = do_fetch(gtransport, refspec, ref_nr); |
Carlos Martín Nieto | 5caf197 | 2011-10-08 00:51:06 +0200 | [diff] [blame] | 1117 | free_refspec(ref_nr, refspec); |
Junio C Hamano | af23445 | 2013-08-07 15:38:45 -0700 | [diff] [blame] | 1118 | transport_disconnect(gtransport); |
| 1119 | gtransport = NULL; |
Alex Riesen | 7b7f39e | 2008-04-28 22:23:35 +0200 | [diff] [blame] | 1120 | return exit_code; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1121 | } |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1122 | |
| 1123 | int cmd_fetch(int argc, const char **argv, const char *prefix) |
| 1124 | { |
| 1125 | int i; |
Thiago Farina | 183113a | 2010-07-04 16:46:19 -0300 | [diff] [blame] | 1126 | struct string_list list = STRING_LIST_INIT_NODUP; |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1127 | struct remote *remote; |
| 1128 | int result = 0; |
Nguyễn Thái Ngọc Duy | 1991006 | 2014-08-16 08:19:27 +0700 | [diff] [blame] | 1129 | struct argv_array argv_gc_auto = ARGV_ARRAY_INIT; |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1130 | |
Jeff King | bbc30f9 | 2011-02-24 09:30:19 -0500 | [diff] [blame] | 1131 | packet_trace_identity("fetch"); |
| 1132 | |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1133 | /* Record the command line for the reflog */ |
| 1134 | strbuf_addstr(&default_rla, "fetch"); |
| 1135 | for (i = 1; i < argc; i++) |
| 1136 | strbuf_addf(&default_rla, " %s", argv[i]); |
| 1137 | |
Michael Schubert | 737c5a9 | 2013-07-13 11:36:24 +0200 | [diff] [blame] | 1138 | git_config(git_fetch_config, NULL); |
| 1139 | |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1140 | argc = parse_options(argc, argv, prefix, |
| 1141 | builtin_fetch_options, builtin_fetch_usage, 0); |
| 1142 | |
Nguyễn Thái Ngọc Duy | 4dcb167 | 2013-01-11 16:05:46 +0700 | [diff] [blame] | 1143 | if (unshallow) { |
| 1144 | if (depth) |
| 1145 | die(_("--depth and --unshallow cannot be used together")); |
| 1146 | else if (!is_repository_shallow()) |
| 1147 | die(_("--unshallow on a complete repository does not make sense")); |
| 1148 | else { |
| 1149 | static char inf_depth[12]; |
| 1150 | sprintf(inf_depth, "%d", INFINITE_DEPTH); |
| 1151 | depth = inf_depth; |
| 1152 | } |
| 1153 | } |
| 1154 | |
Nguyễn Thái Ngọc Duy | 5594bca | 2013-12-05 10:31:11 +0700 | [diff] [blame] | 1155 | /* no need to be strict, transport_set_option() will validate it again */ |
| 1156 | if (depth && atoi(depth) < 1) |
| 1157 | die(_("depth %s is not a positive number"), depth); |
| 1158 | |
Jens Lehmann | 18322ba | 2011-09-09 20:22:03 +0200 | [diff] [blame] | 1159 | if (recurse_submodules != RECURSE_SUBMODULES_OFF) { |
| 1160 | if (recurse_submodules_default) { |
| 1161 | int arg = parse_fetch_recurse_submodules_arg("--recurse-submodules-default", recurse_submodules_default); |
| 1162 | set_config_fetch_recurse_submodules(arg); |
| 1163 | } |
| 1164 | gitmodules_config(); |
| 1165 | git_config(submodule_config, NULL); |
| 1166 | } |
| 1167 | |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1168 | if (all) { |
| 1169 | if (argc == 1) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 1170 | die(_("fetch --all does not take a repository argument")); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1171 | else if (argc > 1) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 1172 | die(_("fetch --all does not make sense with refspecs")); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1173 | (void) for_each_remote(get_one_remote_for_fetch, &list); |
| 1174 | result = fetch_multiple(&list); |
| 1175 | } else if (argc == 0) { |
| 1176 | /* No arguments -- use default remote */ |
| 1177 | remote = remote_get(NULL); |
| 1178 | result = fetch_one(remote, argc, argv); |
Björn Gustavsson | 16679e3 | 2009-11-09 21:10:32 +0100 | [diff] [blame] | 1179 | } else if (multiple) { |
| 1180 | /* All arguments are assumed to be remotes or groups */ |
| 1181 | for (i = 0; i < argc; i++) |
| 1182 | if (!add_remote_or_group(argv[i], &list)) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 1183 | die(_("No such remote or remote group: %s"), argv[i]); |
Björn Gustavsson | 16679e3 | 2009-11-09 21:10:32 +0100 | [diff] [blame] | 1184 | result = fetch_multiple(&list); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1185 | } else { |
| 1186 | /* Single remote or group */ |
| 1187 | (void) add_remote_or_group(argv[0], &list); |
| 1188 | if (list.nr > 1) { |
| 1189 | /* More than one remote */ |
| 1190 | if (argc > 1) |
Ævar Arnfjörð Bjarmason | bd4a51f | 2011-02-22 23:41:51 +0000 | [diff] [blame] | 1191 | die(_("Fetching a group and specifying refspecs does not make sense")); |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1192 | result = fetch_multiple(&list); |
| 1193 | } else { |
| 1194 | /* Zero or one remotes */ |
| 1195 | remote = remote_get(argv[0]); |
| 1196 | result = fetch_one(remote, argc-1, argv+1); |
| 1197 | } |
| 1198 | } |
| 1199 | |
Jens Lehmann | be254a0 | 2010-11-11 00:55:02 +0100 | [diff] [blame] | 1200 | if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) { |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 1201 | struct argv_array options = ARGV_ARRAY_INIT; |
| 1202 | |
| 1203 | add_options_to_argv(&options); |
Jens Lehmann | 50d89ad | 2012-09-01 17:27:06 +0200 | [diff] [blame] | 1204 | result = fetch_populated_submodules(&options, |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 1205 | submodule_prefix, |
Jens Lehmann | 8f0700d | 2011-03-06 23:11:21 +0100 | [diff] [blame] | 1206 | recurse_submodules, |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 1207 | verbosity < 0); |
Jeff King | 85556d4 | 2012-09-01 07:27:35 -0400 | [diff] [blame] | 1208 | argv_array_clear(&options); |
Jens Lehmann | 7dce19d | 2010-11-12 13:54:52 +0100 | [diff] [blame] | 1209 | } |
| 1210 | |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1211 | /* All names were strdup()ed or strndup()ed */ |
| 1212 | list.strdup_strings = 1; |
| 1213 | string_list_clear(&list, 0); |
| 1214 | |
Nguyễn Thái Ngọc Duy | 1991006 | 2014-08-16 08:19:27 +0700 | [diff] [blame] | 1215 | argv_array_pushl(&argv_gc_auto, "gc", "--auto", NULL); |
Nguyễn Thái Ngọc Duy | 6fceed3 | 2014-08-16 08:19:28 +0700 | [diff] [blame] | 1216 | if (verbosity < 0) |
| 1217 | argv_array_push(&argv_gc_auto, "--quiet"); |
Nguyễn Thái Ngọc Duy | 1991006 | 2014-08-16 08:19:27 +0700 | [diff] [blame] | 1218 | run_command_v_opt(argv_gc_auto.argv, RUN_GIT_CMD); |
| 1219 | argv_array_clear(&argv_gc_auto); |
Jeff King | 131b8fc | 2013-01-26 17:40:38 -0500 | [diff] [blame] | 1220 | |
Björn Gustavsson | 9c4a036 | 2009-11-09 21:09:56 +0100 | [diff] [blame] | 1221 | return result; |
| 1222 | } |