]>
Commit | Line | Data |
---|---|---|
b888d61c DB |
1 | /* |
2 | * "git fetch" | |
3 | */ | |
4 | #include "cache.h" | |
b2141fc1 | 5 | #include "config.h" |
e724197f | 6 | #include "repository.h" |
b888d61c | 7 | #include "refs.h" |
ec0cb496 | 8 | #include "refspec.h" |
cbd53a21 | 9 | #include "object-store.h" |
b7e2d8bc | 10 | #include "oidset.h" |
b888d61c DB |
11 | #include "commit.h" |
12 | #include "builtin.h" | |
c455c87c | 13 | #include "string-list.h" |
b888d61c DB |
14 | #include "remote.h" |
15 | #include "transport.h" | |
4191c356 | 16 | #include "run-command.h" |
83201998 | 17 | #include "parse-options.h" |
4a16d072 | 18 | #include "sigchain.h" |
027771fc | 19 | #include "submodule-config.h" |
7dce19d3 | 20 | #include "submodule.h" |
f96400cb | 21 | #include "connected.h" |
85556d4e | 22 | #include "argv-array.h" |
6bc91f23 | 23 | #include "utf8.h" |
3836d88a | 24 | #include "packfile.h" |
acb0c572 | 25 | #include "list-objects-filter-options.h" |
64043556 | 26 | #include "commit-reach.h" |
24bc1a12 | 27 | #include "branch.h" |
b14ed5ad | 28 | #include "promisor-remote.h" |
50f26bd0 | 29 | #include "commit-graph.h" |
120ad2b0 | 30 | #include "shallow.h" |
b888d61c | 31 | |
377444b4 DS |
32 | #define FORCED_UPDATES_DELAY_WARNING_IN_MS (10 * 1000) |
33 | ||
83201998 | 34 | static const char * const builtin_fetch_usage[] = { |
719acedb NTND |
35 | N_("git fetch [<options>] [<repository> [<refspec>...]]"), |
36 | N_("git fetch [<options>] <group>"), | |
37 | N_("git fetch --multiple [<options>] [(<repository> | <group>)...]"), | |
38 | N_("git fetch --all [<options>]"), | |
83201998 KH |
39 | NULL |
40 | }; | |
b888d61c | 41 | |
83201998 KH |
42 | enum { |
43 | TAGS_UNSET = 0, | |
44 | TAGS_DEFAULT = 1, | |
45 | TAGS_SET = 2 | |
46 | }; | |
47 | ||
737c5a9c | 48 | static int fetch_prune_config = -1; /* unspecified */ |
cdbd70c4 | 49 | static int fetch_show_forced_updates = 1; |
377444b4 | 50 | static uint64_t forced_updates_ms = 0; |
737c5a9c MS |
51 | static int prune = -1; /* unspecified */ |
52 | #define PRUNE_BY_DEFAULT 0 /* do we prune by default? */ | |
53 | ||
97716d21 ÆAB |
54 | static int fetch_prune_tags_config = -1; /* unspecified */ |
55 | static int prune_tags = -1; /* unspecified */ | |
56 | #define PRUNE_TAGS_BY_DEFAULT 0 /* do we prune tags by default? */ | |
57 | ||
24bc1a12 CB |
58 | static int all, append, dry_run, force, keep, multiple, update_head_ok; |
59 | static int verbosity, deepen_relative, set_upstream; | |
8c69832d | 60 | static int progress = -1; |
c3d6b703 | 61 | static int enable_auto_gc = 1; |
508ea882 | 62 | static int tags = TAGS_DEFAULT, unshallow, update_shallow, deepen; |
d54dea77 JS |
63 | static int max_jobs = -1, submodule_fetch_jobs_config = -1; |
64 | static int fetch_parallel_config = 1; | |
c915f11e | 65 | static enum transport_family family; |
4191c356 | 66 | static const char *depth; |
508ea882 | 67 | static const char *deepen_since; |
83201998 | 68 | static const char *upload_pack; |
a45a2600 | 69 | static struct string_list deepen_not = STRING_LIST_INIT_NODUP; |
2d324efa | 70 | static struct strbuf default_rla = STRBUF_INIT; |
af234459 | 71 | static struct transport *gtransport; |
b26ed430 | 72 | static struct transport *gsecondary; |
7dce19d3 | 73 | static const char *submodule_prefix = ""; |
8c69832d | 74 | static int recurse_submodules = RECURSE_SUBMODULES_DEFAULT; |
e8906a90 | 75 | static int recurse_submodules_default = RECURSE_SUBMODULES_ON_DEMAND; |
4b3b33a7 | 76 | static int shown_url = 0; |
e4cffacc | 77 | static struct refspec refmap = REFSPEC_INIT_FETCH; |
acb0c572 | 78 | static struct list_objects_filter_options filter_options; |
5e3548ef | 79 | static struct string_list server_options = STRING_LIST_INIT_DUP; |
3390e42a | 80 | static struct string_list negotiation_tip = STRING_LIST_INIT_NODUP; |
c14e6e79 | 81 | static int fetch_write_commit_graph = -1; |
e4022ed2 | 82 | |
737c5a9c MS |
83 | static int git_fetch_config(const char *k, const char *v, void *cb) |
84 | { | |
85 | if (!strcmp(k, "fetch.prune")) { | |
86 | fetch_prune_config = git_config_bool(k, v); | |
87 | return 0; | |
88 | } | |
58f4203e | 89 | |
97716d21 ÆAB |
90 | if (!strcmp(k, "fetch.prunetags")) { |
91 | fetch_prune_tags_config = git_config_bool(k, v); | |
92 | return 0; | |
93 | } | |
94 | ||
cdbd70c4 DS |
95 | if (!strcmp(k, "fetch.showforcedupdates")) { |
96 | fetch_show_forced_updates = git_config_bool(k, v); | |
97 | return 0; | |
98 | } | |
99 | ||
58f4203e SB |
100 | if (!strcmp(k, "submodule.recurse")) { |
101 | int r = git_config_bool(k, v) ? | |
102 | RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF; | |
103 | recurse_submodules = r; | |
104 | } | |
105 | ||
f20e7c1e | 106 | if (!strcmp(k, "submodule.fetchjobs")) { |
d54dea77 | 107 | submodule_fetch_jobs_config = parse_submodule_fetchjobs(k, v); |
f20e7c1e | 108 | return 0; |
8fa29159 BW |
109 | } else if (!strcmp(k, "fetch.recursesubmodules")) { |
110 | recurse_submodules = parse_fetch_recurse_submodules_arg(k, v); | |
111 | return 0; | |
f20e7c1e BW |
112 | } |
113 | ||
d54dea77 JS |
114 | if (!strcmp(k, "fetch.parallel")) { |
115 | fetch_parallel_config = git_config_int(k, v); | |
116 | if (fetch_parallel_config < 0) | |
117 | die(_("fetch.parallel cannot be negative")); | |
118 | return 0; | |
119 | } | |
120 | ||
72549dfd | 121 | return git_default_config(k, v, cb); |
737c5a9c MS |
122 | } |
123 | ||
c5558f80 JH |
124 | static int parse_refmap_arg(const struct option *opt, const char *arg, int unset) |
125 | { | |
517fe807 JK |
126 | BUG_ON_OPT_NEG(unset); |
127 | ||
c5558f80 JH |
128 | /* |
129 | * "git fetch --refmap='' origin foo" | |
130 | * can be used to tell the command not to store anywhere | |
131 | */ | |
e4cffacc BW |
132 | refspec_append(&refmap, arg); |
133 | ||
c5558f80 JH |
134 | return 0; |
135 | } | |
136 | ||
83201998 | 137 | static struct option builtin_fetch_options[] = { |
7f87aff2 | 138 | OPT__VERBOSITY(&verbosity), |
d5d09d47 SB |
139 | OPT_BOOL(0, "all", &all, |
140 | N_("fetch from all remotes")), | |
24bc1a12 CB |
141 | OPT_BOOL(0, "set-upstream", &set_upstream, |
142 | N_("set upstream for git pull/fetch")), | |
d5d09d47 SB |
143 | OPT_BOOL('a', "append", &append, |
144 | N_("append to .git/FETCH_HEAD instead of overwriting")), | |
719acedb NTND |
145 | OPT_STRING(0, "upload-pack", &upload_pack, N_("path"), |
146 | N_("path to upload pack on remote end")), | |
8cd4b7c1 | 147 | OPT__FORCE(&force, N_("force overwrite of local reference"), 0), |
d5d09d47 SB |
148 | OPT_BOOL('m', "multiple", &multiple, |
149 | N_("fetch from multiple remotes")), | |
83201998 | 150 | OPT_SET_INT('t', "tags", &tags, |
719acedb | 151 | N_("fetch all tags and associated objects"), TAGS_SET), |
e7951290 | 152 | OPT_SET_INT('n', NULL, &tags, |
719acedb | 153 | N_("do not fetch all tags (--no-tags)"), TAGS_UNSET), |
d54dea77 | 154 | OPT_INTEGER('j', "jobs", &max_jobs, |
62104ba1 | 155 | N_("number of submodules fetched in parallel")), |
d5d09d47 SB |
156 | OPT_BOOL('p', "prune", &prune, |
157 | N_("prune remote-tracking branches no longer on remote")), | |
97716d21 ÆAB |
158 | OPT_BOOL('P', "prune-tags", &prune_tags, |
159 | N_("prune local tags no longer on remote and clobber changed tags")), | |
203c8533 | 160 | OPT_CALLBACK_F(0, "recurse-submodules", &recurse_submodules, N_("on-demand"), |
719acedb | 161 | N_("control recursive fetching of submodules"), |
203c8533 | 162 | PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules), |
d5d09d47 SB |
163 | OPT_BOOL(0, "dry-run", &dry_run, |
164 | N_("dry run")), | |
165 | OPT_BOOL('k', "keep", &keep, N_("keep downloaded pack")), | |
166 | OPT_BOOL('u', "update-head-ok", &update_head_ok, | |
719acedb NTND |
167 | N_("allow updating of HEAD ref")), |
168 | OPT_BOOL(0, "progress", &progress, N_("force progress reporting")), | |
169 | OPT_STRING(0, "depth", &depth, N_("depth"), | |
170 | N_("deepen history of shallow clone")), | |
508ea882 NTND |
171 | OPT_STRING(0, "shallow-since", &deepen_since, N_("time"), |
172 | N_("deepen history of shallow repository based on time")), | |
a45a2600 | 173 | OPT_STRING_LIST(0, "shallow-exclude", &deepen_not, N_("revision"), |
6d873865 | 174 | N_("deepen history of shallow clone, excluding rev")), |
cccf74e2 NTND |
175 | OPT_INTEGER(0, "deepen", &deepen_relative, |
176 | N_("deepen history of shallow clone")), | |
3e4a67b4 NTND |
177 | OPT_SET_INT_F(0, "unshallow", &unshallow, |
178 | N_("convert to a complete repository"), | |
179 | 1, PARSE_OPT_NONEG), | |
719acedb NTND |
180 | { OPTION_STRING, 0, "submodule-prefix", &submodule_prefix, N_("dir"), |
181 | N_("prepend this to submodule path output"), PARSE_OPT_HIDDEN }, | |
203c8533 | 182 | OPT_CALLBACK_F(0, "recurse-submodules-default", |
8c69832d SB |
183 | &recurse_submodules_default, N_("on-demand"), |
184 | N_("default for recursive fetching of submodules " | |
185 | "(lower priority than config files)"), | |
203c8533 | 186 | PARSE_OPT_HIDDEN, option_fetch_parse_recurse_submodules), |
48d25cae NTND |
187 | OPT_BOOL(0, "update-shallow", &update_shallow, |
188 | N_("accept refs that update .git/shallow")), | |
203c8533 DL |
189 | OPT_CALLBACK_F(0, "refmap", NULL, N_("refmap"), |
190 | N_("specify fetch refmap"), PARSE_OPT_NONEG, parse_refmap_arg), | |
5e3548ef | 191 | OPT_STRING_LIST('o', "server-option", &server_options, N_("server-specific"), N_("option to transmit")), |
c915f11e EW |
192 | OPT_SET_INT('4', "ipv4", &family, N_("use IPv4 addresses only"), |
193 | TRANSPORT_FAMILY_IPV4), | |
194 | OPT_SET_INT('6', "ipv6", &family, N_("use IPv6 addresses only"), | |
195 | TRANSPORT_FAMILY_IPV6), | |
3390e42a JT |
196 | OPT_STRING_LIST(0, "negotiation-tip", &negotiation_tip, N_("revision"), |
197 | N_("report that we have only objects reachable from this object")), | |
acb0c572 | 198 | OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options), |
c3d6b703 NTND |
199 | OPT_BOOL(0, "auto-gc", &enable_auto_gc, |
200 | N_("run 'gc --auto' after fetching")), | |
cdbd70c4 DS |
201 | OPT_BOOL(0, "show-forced-updates", &fetch_show_forced_updates, |
202 | N_("check for forced-updates on all updated branches")), | |
c14e6e79 JS |
203 | OPT_BOOL(0, "write-commit-graph", &fetch_write_commit_graph, |
204 | N_("write the commit-graph after fetching")), | |
83201998 KH |
205 | OPT_END() |
206 | }; | |
207 | ||
e4022ed2 SP |
208 | static void unlock_pack(void) |
209 | { | |
af234459 JH |
210 | if (gtransport) |
211 | transport_unlock_pack(gtransport); | |
b26ed430 JH |
212 | if (gsecondary) |
213 | transport_unlock_pack(gsecondary); | |
e4022ed2 SP |
214 | } |
215 | ||
216 | static void unlock_pack_on_signal(int signo) | |
217 | { | |
218 | unlock_pack(); | |
4a16d072 | 219 | sigchain_pop(signo); |
e4022ed2 SP |
220 | raise(signo); |
221 | } | |
b888d61c | 222 | |
85682c19 | 223 | static void add_merge_config(struct ref **head, |
4577370e | 224 | const struct ref *remote_refs, |
85682c19 SP |
225 | struct branch *branch, |
226 | struct ref ***tail) | |
b888d61c | 227 | { |
85682c19 | 228 | int i; |
b888d61c | 229 | |
85682c19 SP |
230 | for (i = 0; i < branch->merge_nr; i++) { |
231 | struct ref *rm, **old_tail = *tail; | |
0ad4a5ff | 232 | struct refspec_item refspec; |
85682c19 SP |
233 | |
234 | for (rm = *head; rm; rm = rm->next) { | |
235 | if (branch_merge_matches(branch, i, rm->name)) { | |
900f2814 | 236 | rm->fetch_head_status = FETCH_HEAD_MERGE; |
85682c19 SP |
237 | break; |
238 | } | |
b888d61c | 239 | } |
85682c19 SP |
240 | if (rm) |
241 | continue; | |
242 | ||
9ad7c5ae | 243 | /* |
8b3f3f84 | 244 | * Not fetched to a remote-tracking branch? We need to fetch |
85682c19 | 245 | * it anyway to allow this branch's "branch.$name.merge" |
05207a28 | 246 | * to be honored by 'git pull', but we do not have to |
9ad7c5ae JH |
247 | * fail if branch.$name.merge is misconfigured to point |
248 | * at a nonexisting branch. If we were indeed called by | |
05207a28 | 249 | * 'git pull', it will notice the misconfiguration because |
9ad7c5ae JH |
250 | * there is no entry in the resulting FETCH_HEAD marked |
251 | * for merging. | |
85682c19 | 252 | */ |
8da61a2a | 253 | memset(&refspec, 0, sizeof(refspec)); |
85682c19 | 254 | refspec.src = branch->merge[i]->src; |
9ad7c5ae | 255 | get_fetch_map(remote_refs, &refspec, tail, 1); |
85682c19 | 256 | for (rm = *old_tail; rm; rm = rm->next) |
900f2814 | 257 | rm->fetch_head_status = FETCH_HEAD_MERGE; |
b888d61c DB |
258 | } |
259 | } | |
260 | ||
b7e2d8bc | 261 | static void create_fetch_oidset(struct ref **head, struct oidset *out) |
a0fbb5a3 MH |
262 | { |
263 | struct ref *rm = *head; | |
264 | while (rm) { | |
b7e2d8bc | 265 | oidset_insert(out, &rm->old_oid); |
a0fbb5a3 MH |
266 | rm = rm->next; |
267 | } | |
a0fbb5a3 MH |
268 | } |
269 | ||
e198b3a7 | 270 | struct refname_hash_entry { |
e2b5038d | 271 | struct hashmap_entry ent; |
e198b3a7 | 272 | struct object_id oid; |
f80d9223 | 273 | int ignore; |
e198b3a7 JH |
274 | char refname[FLEX_ARRAY]; |
275 | }; | |
276 | ||
277 | static int refname_hash_entry_cmp(const void *hashmap_cmp_fn_data, | |
939af16e EW |
278 | const struct hashmap_entry *eptr, |
279 | const struct hashmap_entry *entry_or_key, | |
e198b3a7 JH |
280 | const void *keydata) |
281 | { | |
939af16e | 282 | const struct refname_hash_entry *e1, *e2; |
e198b3a7 | 283 | |
939af16e EW |
284 | e1 = container_of(eptr, const struct refname_hash_entry, ent); |
285 | e2 = container_of(entry_or_key, const struct refname_hash_entry, ent); | |
e198b3a7 JH |
286 | return strcmp(e1->refname, keydata ? keydata : e2->refname); |
287 | } | |
288 | ||
289 | static struct refname_hash_entry *refname_hash_add(struct hashmap *map, | |
290 | const char *refname, | |
291 | const struct object_id *oid) | |
292 | { | |
293 | struct refname_hash_entry *ent; | |
294 | size_t len = strlen(refname); | |
295 | ||
296 | FLEX_ALLOC_MEM(ent, refname, refname, len); | |
d22245a2 | 297 | hashmap_entry_init(&ent->ent, strhash(refname)); |
e198b3a7 | 298 | oidcpy(&ent->oid, oid); |
b94e5c1d | 299 | hashmap_add(map, &ent->ent); |
e198b3a7 JH |
300 | return ent; |
301 | } | |
302 | ||
303 | static int add_one_refname(const char *refname, | |
304 | const struct object_id *oid, | |
305 | int flag, void *cbdata) | |
306 | { | |
307 | struct hashmap *refname_map = cbdata; | |
308 | ||
309 | (void) refname_hash_add(refname_map, refname, oid); | |
310 | return 0; | |
311 | } | |
312 | ||
313 | static void refname_hash_init(struct hashmap *map) | |
314 | { | |
315 | hashmap_init(map, refname_hash_entry_cmp, NULL, 0); | |
316 | } | |
317 | ||
318 | static int refname_hash_exists(struct hashmap *map, const char *refname) | |
319 | { | |
320 | return !!hashmap_get_from_hash(map, strhash(refname), refname); | |
321 | } | |
322 | ||
a8363b57 FC |
323 | static void clear_item(struct refname_hash_entry *item) |
324 | { | |
f80d9223 | 325 | item->ignore = 1; |
a8363b57 FC |
326 | } |
327 | ||
6d1700d5 BW |
328 | static void find_non_local_tags(const struct ref *refs, |
329 | struct ref **head, | |
330 | struct ref ***tail) | |
a0fbb5a3 | 331 | { |
e198b3a7 JH |
332 | struct hashmap existing_refs; |
333 | struct hashmap remote_refs; | |
b7e2d8bc | 334 | struct oidset fetch_oids = OIDSET_INIT; |
e198b3a7 JH |
335 | struct string_list remote_refs_list = STRING_LIST_INIT_NODUP; |
336 | struct string_list_item *remote_ref_item; | |
a0fbb5a3 | 337 | const struct ref *ref; |
e198b3a7 | 338 | struct refname_hash_entry *item = NULL; |
3e96c668 | 339 | const int quick_flags = OBJECT_INFO_QUICK | OBJECT_INFO_SKIP_FETCH_OBJECT; |
e198b3a7 JH |
340 | |
341 | refname_hash_init(&existing_refs); | |
342 | refname_hash_init(&remote_refs); | |
b7e2d8bc | 343 | create_fetch_oidset(head, &fetch_oids); |
a0fbb5a3 | 344 | |
e198b3a7 | 345 | for_each_ref(add_one_refname, &existing_refs); |
6d1700d5 | 346 | for (ref = refs; ref; ref = ref->next) { |
ad704485 | 347 | if (!starts_with(ref->name, "refs/tags/")) |
a0fbb5a3 MH |
348 | continue; |
349 | ||
350 | /* | |
351 | * The peeled ref always follows the matching base | |
352 | * ref, so if we see a peeled ref that we don't want | |
353 | * to fetch then we can mark the ref entry in the list | |
354 | * as one to ignore by setting util to NULL. | |
355 | */ | |
ad704485 | 356 | if (ends_with(ref->name, "^{}")) { |
5827a035 | 357 | if (item && |
3e96c668 | 358 | !has_object_file_with_flags(&ref->old_oid, quick_flags) && |
b7e2d8bc | 359 | !oidset_contains(&fetch_oids, &ref->old_oid) && |
3e96c668 | 360 | !has_object_file_with_flags(&item->oid, quick_flags) && |
b7e2d8bc | 361 | !oidset_contains(&fetch_oids, &item->oid)) |
a8363b57 | 362 | clear_item(item); |
a0fbb5a3 MH |
363 | item = NULL; |
364 | continue; | |
365 | } | |
366 | ||
367 | /* | |
368 | * If item is non-NULL here, then we previously saw a | |
369 | * ref not followed by a peeled reference, so we need | |
370 | * to check if it is a lightweight tag that we want to | |
371 | * fetch. | |
372 | */ | |
5827a035 | 373 | if (item && |
3e96c668 | 374 | !has_object_file_with_flags(&item->oid, quick_flags) && |
b7e2d8bc | 375 | !oidset_contains(&fetch_oids, &item->oid)) |
a8363b57 | 376 | clear_item(item); |
a0fbb5a3 MH |
377 | |
378 | item = NULL; | |
379 | ||
380 | /* skip duplicates and refs that we already have */ | |
e198b3a7 JH |
381 | if (refname_hash_exists(&remote_refs, ref->name) || |
382 | refname_hash_exists(&existing_refs, ref->name)) | |
a0fbb5a3 MH |
383 | continue; |
384 | ||
e198b3a7 JH |
385 | item = refname_hash_add(&remote_refs, ref->name, &ref->old_oid); |
386 | string_list_insert(&remote_refs_list, ref->name); | |
a0fbb5a3 | 387 | } |
c8e424c9 | 388 | hashmap_free_entries(&existing_refs, struct refname_hash_entry, ent); |
a0fbb5a3 MH |
389 | |
390 | /* | |
391 | * We may have a final lightweight tag that needs to be | |
392 | * checked to see if it needs fetching. | |
393 | */ | |
5827a035 | 394 | if (item && |
3e96c668 | 395 | !has_object_file_with_flags(&item->oid, quick_flags) && |
b7e2d8bc | 396 | !oidset_contains(&fetch_oids, &item->oid)) |
a8363b57 | 397 | clear_item(item); |
a0fbb5a3 MH |
398 | |
399 | /* | |
e198b3a7 | 400 | * For all the tags in the remote_refs_list, |
a0fbb5a3 MH |
401 | * add them to the list of refs to be fetched |
402 | */ | |
e198b3a7 JH |
403 | for_each_string_list_item(remote_ref_item, &remote_refs_list) { |
404 | const char *refname = remote_ref_item->string; | |
9528b80b | 405 | struct ref *rm; |
f23a4651 | 406 | unsigned int hash = strhash(refname); |
e198b3a7 | 407 | |
f23a4651 EW |
408 | item = hashmap_get_entry_from_hash(&remote_refs, hash, refname, |
409 | struct refname_hash_entry, ent); | |
e198b3a7 JH |
410 | if (!item) |
411 | BUG("unseen remote ref?"); | |
412 | ||
a0fbb5a3 | 413 | /* Unless we have already decided to ignore this item... */ |
f80d9223 | 414 | if (item->ignore) |
9528b80b FC |
415 | continue; |
416 | ||
417 | rm = alloc_ref(item->refname); | |
418 | rm->peer_ref = alloc_ref(item->refname); | |
419 | oidcpy(&rm->old_oid, &item->oid); | |
420 | **tail = rm; | |
421 | *tail = &rm->next; | |
a0fbb5a3 | 422 | } |
c8e424c9 | 423 | hashmap_free_entries(&remote_refs, struct refname_hash_entry, ent); |
e198b3a7 | 424 | string_list_clear(&remote_refs_list, 0); |
b7e2d8bc | 425 | oidset_clear(&fetch_oids); |
a0fbb5a3 | 426 | } |
767f176a | 427 | |
6d1700d5 BW |
428 | static struct ref *get_ref_map(struct remote *remote, |
429 | const struct ref *remote_refs, | |
65d96c8b | 430 | struct refspec *rs, |
f137a45e | 431 | int tags, int *autotags) |
b888d61c DB |
432 | { |
433 | int i; | |
434 | struct ref *rm; | |
435 | struct ref *ref_map = NULL; | |
436 | struct ref **tail = &ref_map; | |
437 | ||
c5a84e92 MH |
438 | /* opportunistically-updated references: */ |
439 | struct ref *orefs = NULL, **oref_tail = &orefs; | |
b888d61c | 440 | |
e198b3a7 | 441 | struct hashmap existing_refs; |
f2690487 | 442 | |
65d96c8b | 443 | if (rs->nr) { |
c5558f80 | 444 | struct refspec *fetch_refspec; |
c5558f80 | 445 | |
65d96c8b BW |
446 | for (i = 0; i < rs->nr; i++) { |
447 | get_fetch_map(remote_refs, &rs->items[i], &tail, 0); | |
448 | if (rs->items[i].dst && rs->items[i].dst[0]) | |
b888d61c DB |
449 | *autotags = 1; |
450 | } | |
0281c930 | 451 | /* Merge everything on the command line (but not --tags) */ |
b888d61c | 452 | for (rm = ref_map; rm; rm = rm->next) |
900f2814 | 453 | rm->fetch_head_status = FETCH_HEAD_MERGE; |
f2690487 JK |
454 | |
455 | /* | |
0281c930 MH |
456 | * For any refs that we happen to be fetching via |
457 | * command-line arguments, the destination ref might | |
458 | * have been missing or have been different than the | |
459 | * remote-tracking ref that would be derived from the | |
460 | * configured refspec. In these cases, we want to | |
461 | * take the opportunity to update their configured | |
462 | * remote-tracking reference. However, we do not want | |
463 | * to mention these entries in FETCH_HEAD at all, as | |
464 | * they would simply be duplicates of existing | |
465 | * entries, so we set them FETCH_HEAD_IGNORE below. | |
466 | * | |
467 | * We compute these entries now, based only on the | |
468 | * refspecs specified on the command line. But we add | |
469 | * them to the list following the refspecs resulting | |
470 | * from the tags option so that one of the latter, | |
471 | * which has FETCH_HEAD_NOT_FOR_MERGE, is not removed | |
472 | * by ref_remove_duplicates() in favor of one of these | |
473 | * opportunistic entries with FETCH_HEAD_IGNORE. | |
f2690487 | 474 | */ |
65d96c8b BW |
475 | if (refmap.nr) |
476 | fetch_refspec = &refmap; | |
477 | else | |
6d1700d5 | 478 | fetch_refspec = &remote->fetch; |
c5558f80 | 479 | |
65d96c8b BW |
480 | for (i = 0; i < fetch_refspec->nr; i++) |
481 | get_fetch_map(ref_map, &fetch_refspec->items[i], &oref_tail, 1); | |
e4cffacc | 482 | } else if (refmap.nr) { |
c5558f80 | 483 | die("--refmap option is only meaningful with command-line refspec(s)."); |
b888d61c DB |
484 | } else { |
485 | /* Use the defaults */ | |
85682c19 SP |
486 | struct branch *branch = branch_get(NULL); |
487 | int has_merge = branch_has_merge_config(branch); | |
3ee1757b | 488 | if (remote && |
e5349abf | 489 | (remote->fetch.nr || |
f31dbdc7 | 490 | /* Note: has_merge implies non-NULL branch->remote_name */ |
3ee1757b | 491 | (has_merge && !strcmp(branch->remote_name, remote->name)))) { |
e5349abf BW |
492 | for (i = 0; i < remote->fetch.nr; i++) { |
493 | get_fetch_map(remote_refs, &remote->fetch.items[i], &tail, 0); | |
494 | if (remote->fetch.items[i].dst && | |
495 | remote->fetch.items[i].dst[0]) | |
b888d61c | 496 | *autotags = 1; |
85682c19 | 497 | if (!i && !has_merge && ref_map && |
e5349abf | 498 | !remote->fetch.items[0].pattern) |
900f2814 | 499 | ref_map->fetch_head_status = FETCH_HEAD_MERGE; |
b888d61c | 500 | } |
da0204df JS |
501 | /* |
502 | * if the remote we're fetching from is the same | |
503 | * as given in branch.<name>.remote, we add the | |
504 | * ref given in branch.<name>.merge, too. | |
f31dbdc7 BC |
505 | * |
506 | * Note: has_merge implies non-NULL branch->remote_name | |
da0204df | 507 | */ |
9ad7c5ae JH |
508 | if (has_merge && |
509 | !strcmp(branch->remote_name, remote->name)) | |
85682c19 | 510 | add_merge_config(&ref_map, remote_refs, branch, &tail); |
b888d61c DB |
511 | } else { |
512 | ref_map = get_remote_ref(remote_refs, "HEAD"); | |
9ad7c5ae | 513 | if (!ref_map) |
bd4a51fc | 514 | die(_("Couldn't find remote ref HEAD")); |
900f2814 | 515 | ref_map->fetch_head_status = FETCH_HEAD_MERGE; |
5aaf7f2a | 516 | tail = &ref_map->next; |
b888d61c DB |
517 | } |
518 | } | |
0281c930 | 519 | |
c5a84e92 MH |
520 | if (tags == TAGS_SET) |
521 | /* also fetch all tags */ | |
522 | get_fetch_map(remote_refs, tag_refspec, &tail, 0); | |
523 | else if (tags == TAGS_DEFAULT && *autotags) | |
6d1700d5 | 524 | find_non_local_tags(remote_refs, &ref_map, &tail); |
0281c930 | 525 | |
c5a84e92 MH |
526 | /* Now append any refs to be updated opportunistically: */ |
527 | *tail = orefs; | |
528 | for (rm = orefs; rm; rm = rm->next) { | |
529 | rm->fetch_head_status = FETCH_HEAD_IGNORE; | |
530 | tail = &rm->next; | |
531 | } | |
532 | ||
14b8ced3 BW |
533 | ref_map = ref_remove_duplicates(ref_map); |
534 | ||
e198b3a7 JH |
535 | refname_hash_init(&existing_refs); |
536 | for_each_ref(add_one_refname, &existing_refs); | |
537 | ||
14b8ced3 BW |
538 | for (rm = ref_map; rm; rm = rm->next) { |
539 | if (rm->peer_ref) { | |
e198b3a7 JH |
540 | const char *refname = rm->peer_ref->name; |
541 | struct refname_hash_entry *peer_item; | |
f23a4651 | 542 | unsigned int hash = strhash(refname); |
e198b3a7 | 543 | |
f23a4651 EW |
544 | peer_item = hashmap_get_entry_from_hash(&existing_refs, |
545 | hash, refname, | |
546 | struct refname_hash_entry, ent); | |
14b8ced3 | 547 | if (peer_item) { |
e198b3a7 | 548 | struct object_id *old_oid = &peer_item->oid; |
14b8ced3 BW |
549 | oidcpy(&rm->peer_ref->old_oid, old_oid); |
550 | } | |
551 | } | |
552 | } | |
c8e424c9 | 553 | hashmap_free_entries(&existing_refs, struct refname_hash_entry, ent); |
14b8ced3 BW |
554 | |
555 | return ref_map; | |
b888d61c DB |
556 | } |
557 | ||
fa250759 JK |
558 | #define STORE_REF_ERROR_OTHER 1 |
559 | #define STORE_REF_ERROR_DF_CONFLICT 2 | |
560 | ||
b888d61c DB |
561 | static int s_update_ref(const char *action, |
562 | struct ref *ref, | |
563 | int check_old) | |
564 | { | |
1412f762 | 565 | char *msg; |
b888d61c | 566 | char *rla = getenv("GIT_REFLOG_ACTION"); |
cd94f765 RS |
567 | struct ref_transaction *transaction; |
568 | struct strbuf err = STRBUF_INIT; | |
569 | int ret, df_conflict = 0; | |
b888d61c | 570 | |
28a15401 JS |
571 | if (dry_run) |
572 | return 0; | |
b888d61c | 573 | if (!rla) |
2d324efa | 574 | rla = default_rla.buf; |
1412f762 | 575 | msg = xstrfmt("%s: %s", rla, action); |
cd94f765 RS |
576 | |
577 | transaction = ref_transaction_begin(&err); | |
578 | if (!transaction || | |
1d147bdf | 579 | ref_transaction_update(transaction, ref->name, |
89f3bbdd | 580 | &ref->new_oid, |
581 | check_old ? &ref->old_oid : NULL, | |
1d147bdf | 582 | 0, msg, &err)) |
cd94f765 RS |
583 | goto fail; |
584 | ||
585 | ret = ref_transaction_commit(transaction, &err); | |
586 | if (ret) { | |
587 | df_conflict = (ret == TRANSACTION_NAME_CONFLICT); | |
588 | goto fail; | |
589 | } | |
590 | ||
591 | ref_transaction_free(transaction); | |
592 | strbuf_release(&err); | |
1412f762 | 593 | free(msg); |
b888d61c | 594 | return 0; |
cd94f765 RS |
595 | fail: |
596 | ref_transaction_free(transaction); | |
597 | error("%s", err.buf); | |
598 | strbuf_release(&err); | |
1412f762 | 599 | free(msg); |
cd94f765 RS |
600 | return df_conflict ? STORE_REF_ERROR_DF_CONFLICT |
601 | : STORE_REF_ERROR_OTHER; | |
b888d61c DB |
602 | } |
603 | ||
6bc91f23 | 604 | static int refcol_width = 10; |
bc437d10 | 605 | static int compact_format; |
6bc91f23 NTND |
606 | |
607 | static void adjust_refcol_width(const struct ref *ref) | |
608 | { | |
609 | int max, rlen, llen, len; | |
610 | ||
611 | /* uptodate lines are only shown on high verbosity level */ | |
4a7e27e9 | 612 | if (!verbosity && oideq(&ref->peer_ref->old_oid, &ref->old_oid)) |
6bc91f23 NTND |
613 | return; |
614 | ||
615 | max = term_columns(); | |
616 | rlen = utf8_strwidth(prettify_refname(ref->name)); | |
bc437d10 | 617 | |
6bc91f23 NTND |
618 | llen = utf8_strwidth(prettify_refname(ref->peer_ref->name)); |
619 | ||
620 | /* | |
621 | * rough estimation to see if the output line is too long and | |
622 | * should not be counted (we can't do precise calculation | |
623 | * anyway because we don't know if the error explanation part | |
624 | * will be printed in update_local_ref) | |
625 | */ | |
bc437d10 NTND |
626 | if (compact_format) { |
627 | llen = 0; | |
628 | max = max * 2 / 3; | |
629 | } | |
6bc91f23 NTND |
630 | len = 21 /* flag and summary */ + rlen + 4 /* -> */ + llen; |
631 | if (len >= max) | |
632 | return; | |
633 | ||
bc437d10 NTND |
634 | /* |
635 | * Not precise calculation for compact mode because '*' can | |
636 | * appear on the left hand side of '->' and shrink the column | |
637 | * back. | |
638 | */ | |
6bc91f23 NTND |
639 | if (refcol_width < rlen) |
640 | refcol_width = rlen; | |
641 | } | |
642 | ||
643 | static void prepare_format_display(struct ref *ref_map) | |
644 | { | |
645 | struct ref *rm; | |
bc437d10 NTND |
646 | const char *format = "full"; |
647 | ||
f1de981e | 648 | git_config_get_string_tmp("fetch.output", &format); |
bc437d10 NTND |
649 | if (!strcasecmp(format, "full")) |
650 | compact_format = 0; | |
651 | else if (!strcasecmp(format, "compact")) | |
652 | compact_format = 1; | |
653 | else | |
654 | die(_("configuration fetch.output contains invalid value %s"), | |
655 | format); | |
6bc91f23 NTND |
656 | |
657 | for (rm = ref_map; rm; rm = rm->next) { | |
658 | if (rm->status == REF_STATUS_REJECT_SHALLOW || | |
659 | !rm->peer_ref || | |
660 | !strcmp(rm->name, "HEAD")) | |
661 | continue; | |
662 | ||
663 | adjust_refcol_width(rm); | |
664 | } | |
665 | } | |
165f3902 | 666 | |
bc437d10 NTND |
667 | static void print_remote_to_local(struct strbuf *display, |
668 | const char *remote, const char *local) | |
669 | { | |
670 | strbuf_addf(display, "%-*s -> %s", refcol_width, remote, local); | |
671 | } | |
672 | ||
673 | static int find_and_replace(struct strbuf *haystack, | |
674 | const char *needle, | |
675 | const char *placeholder) | |
676 | { | |
dc40b24d | 677 | const char *p = NULL; |
bc437d10 NTND |
678 | int plen, nlen; |
679 | ||
dc40b24d NTND |
680 | nlen = strlen(needle); |
681 | if (ends_with(haystack->buf, needle)) | |
682 | p = haystack->buf + haystack->len - nlen; | |
683 | else | |
684 | p = strstr(haystack->buf, needle); | |
bc437d10 NTND |
685 | if (!p) |
686 | return 0; | |
687 | ||
688 | if (p > haystack->buf && p[-1] != '/') | |
689 | return 0; | |
690 | ||
691 | plen = strlen(p); | |
bc437d10 NTND |
692 | if (plen > nlen && p[nlen] != '/') |
693 | return 0; | |
694 | ||
695 | strbuf_splice(haystack, p - haystack->buf, nlen, | |
696 | placeholder, strlen(placeholder)); | |
697 | return 1; | |
698 | } | |
699 | ||
700 | static void print_compact(struct strbuf *display, | |
701 | const char *remote, const char *local) | |
702 | { | |
703 | struct strbuf r = STRBUF_INIT; | |
704 | struct strbuf l = STRBUF_INIT; | |
705 | ||
706 | if (!strcmp(remote, local)) { | |
707 | strbuf_addf(display, "%-*s -> *", refcol_width, remote); | |
708 | return; | |
709 | } | |
710 | ||
711 | strbuf_addstr(&r, remote); | |
712 | strbuf_addstr(&l, local); | |
713 | ||
714 | if (!find_and_replace(&r, local, "*")) | |
715 | find_and_replace(&l, remote, "*"); | |
716 | print_remote_to_local(display, r.buf, l.buf); | |
717 | ||
718 | strbuf_release(&r); | |
719 | strbuf_release(&l); | |
720 | } | |
721 | ||
d0b39a03 NTND |
722 | static void format_display(struct strbuf *display, char code, |
723 | const char *summary, const char *error, | |
901f3d40 JH |
724 | const char *remote, const char *local, |
725 | int summary_width) | |
d0b39a03 | 726 | { |
901f3d40 JH |
727 | int width = (summary_width + strlen(summary) - gettext_width(summary)); |
728 | ||
729 | strbuf_addf(display, "%c %-*s ", code, width, summary); | |
bc437d10 NTND |
730 | if (!compact_format) |
731 | print_remote_to_local(display, remote, local); | |
732 | else | |
733 | print_compact(display, remote, local); | |
d0b39a03 NTND |
734 | if (error) |
735 | strbuf_addf(display, " (%s)", error); | |
736 | } | |
165f3902 | 737 | |
b888d61c | 738 | static int update_local_ref(struct ref *ref, |
165f3902 | 739 | const char *remote, |
6da618d5 | 740 | const struct ref *remote_ref, |
901f3d40 JH |
741 | struct strbuf *display, |
742 | int summary_width) | |
b888d61c | 743 | { |
b888d61c DB |
744 | struct commit *current = NULL, *updated; |
745 | enum object_type type; | |
746 | struct branch *current_branch = branch_get(NULL); | |
4577e483 | 747 | const char *pretty_ref = prettify_refname(ref->name); |
377444b4 | 748 | int fast_forward = 0; |
b888d61c | 749 | |
0df8e965 | 750 | type = oid_object_info(the_repository, &ref->new_oid, NULL); |
b888d61c | 751 | if (type < 0) |
f4e54d02 | 752 | die(_("object %s not found"), oid_to_hex(&ref->new_oid)); |
b888d61c | 753 | |
4a7e27e9 | 754 | if (oideq(&ref->old_oid, &ref->new_oid)) { |
7f87aff2 | 755 | if (verbosity > 0) |
d0b39a03 | 756 | format_display(display, '=', _("[up to date]"), NULL, |
901f3d40 | 757 | remote, pretty_ref, summary_width); |
b888d61c DB |
758 | return 0; |
759 | } | |
760 | ||
b3abdd9d SP |
761 | if (current_branch && |
762 | !strcmp(ref->name, current_branch->name) && | |
b888d61c | 763 | !(update_head_ok || is_bare_repository()) && |
f4e54d02 | 764 | !is_null_oid(&ref->old_oid)) { |
b888d61c DB |
765 | /* |
766 | * If this is the head, and it's not okay to update | |
767 | * the head, and the old value of the head isn't empty... | |
768 | */ | |
d0b39a03 NTND |
769 | format_display(display, '!', _("[rejected]"), |
770 | _("can't fetch in current branch"), | |
901f3d40 | 771 | remote, pretty_ref, summary_width); |
b888d61c DB |
772 | return 1; |
773 | } | |
774 | ||
f4e54d02 | 775 | if (!is_null_oid(&ref->old_oid) && |
59556548 | 776 | starts_with(ref->name, "refs/tags/")) { |
0bc8d71b ÆAB |
777 | if (force || ref->force) { |
778 | int r; | |
779 | r = s_update_ref("updating tag", ref, 0); | |
780 | format_display(display, r ? '!' : 't', _("[tag update]"), | |
781 | r ? _("unable to update local ref") : NULL, | |
782 | remote, pretty_ref, summary_width); | |
783 | return r; | |
784 | } else { | |
785 | format_display(display, '!', _("[rejected]"), _("would clobber existing tag"), | |
786 | remote, pretty_ref, summary_width); | |
787 | return 1; | |
788 | } | |
b888d61c DB |
789 | } |
790 | ||
21e1ee8f SB |
791 | current = lookup_commit_reference_gently(the_repository, |
792 | &ref->old_oid, 1); | |
793 | updated = lookup_commit_reference_gently(the_repository, | |
794 | &ref->new_oid, 1); | |
b888d61c | 795 | if (!current || !updated) { |
165f3902 NP |
796 | const char *msg; |
797 | const char *what; | |
6315472e | 798 | int r; |
0997adaa MB |
799 | /* |
800 | * Nicely describe the new ref we're fetching. | |
801 | * Base this on the remote's ref name, as it's | |
802 | * more likely to follow a standard layout. | |
803 | */ | |
804 | const char *name = remote_ref ? remote_ref->name : ""; | |
59556548 | 805 | if (starts_with(name, "refs/tags/")) { |
b888d61c | 806 | msg = "storing tag"; |
f7b3742a | 807 | what = _("[new tag]"); |
59556548 | 808 | } else if (starts_with(name, "refs/heads/")) { |
b888d61c | 809 | msg = "storing head"; |
f7b3742a | 810 | what = _("[new branch]"); |
0997adaa MB |
811 | } else { |
812 | msg = "storing ref"; | |
813 | what = _("[new ref]"); | |
165f3902 NP |
814 | } |
815 | ||
6315472e | 816 | r = s_update_ref(msg, ref, 0); |
d0b39a03 NTND |
817 | format_display(display, r ? '!' : '*', what, |
818 | r ? _("unable to update local ref") : NULL, | |
901f3d40 | 819 | remote, pretty_ref, summary_width); |
6315472e | 820 | return r; |
b888d61c DB |
821 | } |
822 | ||
377444b4 DS |
823 | if (fetch_show_forced_updates) { |
824 | uint64_t t_before = getnanotime(); | |
825 | fast_forward = in_merge_bases(current, updated); | |
826 | forced_updates_ms += (getnanotime() - t_before) / 1000000; | |
827 | } else { | |
828 | fast_forward = 1; | |
829 | } | |
830 | ||
831 | if (fast_forward) { | |
bd22d4ff | 832 | struct strbuf quickref = STRBUF_INIT; |
6315472e | 833 | int r; |
cdbd70c4 | 834 | |
30e677e0 | 835 | strbuf_add_unique_abbrev(&quickref, ¤t->object.oid, DEFAULT_ABBREV); |
bd22d4ff | 836 | strbuf_addstr(&quickref, ".."); |
30e677e0 | 837 | strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV); |
a75d7b54 | 838 | r = s_update_ref("fast-forward", ref, 1); |
d0b39a03 NTND |
839 | format_display(display, r ? '!' : ' ', quickref.buf, |
840 | r ? _("unable to update local ref") : NULL, | |
901f3d40 | 841 | remote, pretty_ref, summary_width); |
bd22d4ff | 842 | strbuf_release(&quickref); |
6315472e | 843 | return r; |
165f3902 | 844 | } else if (force || ref->force) { |
bd22d4ff | 845 | struct strbuf quickref = STRBUF_INIT; |
6315472e | 846 | int r; |
30e677e0 | 847 | strbuf_add_unique_abbrev(&quickref, ¤t->object.oid, DEFAULT_ABBREV); |
bd22d4ff | 848 | strbuf_addstr(&quickref, "..."); |
30e677e0 | 849 | strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV); |
6315472e | 850 | r = s_update_ref("forced-update", ref, 1); |
d0b39a03 NTND |
851 | format_display(display, r ? '!' : '+', quickref.buf, |
852 | r ? _("unable to update local ref") : _("forced update"), | |
901f3d40 | 853 | remote, pretty_ref, summary_width); |
bd22d4ff | 854 | strbuf_release(&quickref); |
6315472e | 855 | return r; |
165f3902 | 856 | } else { |
d0b39a03 | 857 | format_display(display, '!', _("[rejected]"), _("non-fast-forward"), |
901f3d40 | 858 | remote, pretty_ref, summary_width); |
b888d61c DB |
859 | return 1; |
860 | } | |
b888d61c DB |
861 | } |
862 | ||
6ccac9ee | 863 | static int iterate_ref_map(void *cb_data, struct object_id *oid) |
6b67e0dc | 864 | { |
f0e278b1 JH |
865 | struct ref **rm = cb_data; |
866 | struct ref *ref = *rm; | |
6b67e0dc | 867 | |
4820a33b NTND |
868 | while (ref && ref->status == REF_STATUS_REJECT_SHALLOW) |
869 | ref = ref->next; | |
f0e278b1 JH |
870 | if (!ref) |
871 | return -1; /* end of the list */ | |
872 | *rm = ref->next; | |
6ccac9ee | 873 | oidcpy(oid, &ref->old_oid); |
f0e278b1 | 874 | return 0; |
6b67e0dc JH |
875 | } |
876 | ||
182f59da JNA |
877 | static const char warn_show_forced_updates[] = |
878 | N_("Fetch normally indicates which branches had a forced update,\n" | |
879 | "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" | |
880 | "flag or run 'git config fetch.showForcedUpdates true'."); | |
881 | static const char warn_time_show_forced_updates[] = | |
882 | N_("It took %.2f seconds to check forced updates. You can use\n" | |
883 | "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates false'\n" | |
884 | " to avoid this check.\n"); | |
885 | ||
47abd85b | 886 | static int store_updated_refs(const char *raw_url, const char *remote_name, |
cf1e7c07 | 887 | int connectivity_checked, struct ref *ref_map) |
b888d61c DB |
888 | { |
889 | FILE *fp; | |
890 | struct commit *commit; | |
4b3b33a7 | 891 | int url_len, i, rc = 0; |
5914f2d0 | 892 | struct strbuf note = STRBUF_INIT; |
b888d61c DB |
893 | const char *what, *kind; |
894 | struct ref *rm; | |
dcf69262 | 895 | char *url; |
102de880 | 896 | const char *filename = dry_run ? "/dev/null" : git_path_fetch_head(the_repository); |
900f2814 | 897 | int want_status; |
11fd66de | 898 | int summary_width = transport_summary_width(ref_map); |
b888d61c | 899 | |
d6617c7c AGR |
900 | fp = fopen(filename, "a"); |
901 | if (!fp) | |
6da31d7f | 902 | return error_errno(_("cannot open %s"), filename); |
47abd85b | 903 | |
fb0cc87e DB |
904 | if (raw_url) |
905 | url = transport_anonymize_url(raw_url); | |
906 | else | |
907 | url = xstrdup("foreign"); | |
6b67e0dc | 908 | |
cf1e7c07 | 909 | if (!connectivity_checked) { |
2df1aa23 JT |
910 | struct check_connected_options opt = CHECK_CONNECTED_INIT; |
911 | ||
cf1e7c07 | 912 | rm = ref_map; |
2df1aa23 | 913 | if (check_connected(iterate_ref_map, &rm, &opt)) { |
cf1e7c07 JT |
914 | rc = error(_("%s did not send all necessary objects\n"), url); |
915 | goto abort; | |
916 | } | |
9516a598 | 917 | } |
6b67e0dc | 918 | |
6bc91f23 NTND |
919 | prepare_format_display(ref_map); |
920 | ||
96890f4c | 921 | /* |
900f2814 JK |
922 | * We do a pass for each fetch_head_status type in their enum order, so |
923 | * merged entries are written before not-for-merge. That lets readers | |
924 | * use FETCH_HEAD as a refname to refer to the ref to be merged. | |
96890f4c | 925 | */ |
900f2814 JK |
926 | for (want_status = FETCH_HEAD_MERGE; |
927 | want_status <= FETCH_HEAD_IGNORE; | |
928 | want_status++) { | |
96890f4c JH |
929 | for (rm = ref_map; rm; rm = rm->next) { |
930 | struct ref *ref = NULL; | |
900f2814 | 931 | const char *merge_status_marker = ""; |
96890f4c | 932 | |
4820a33b NTND |
933 | if (rm->status == REF_STATUS_REJECT_SHALLOW) { |
934 | if (want_status == FETCH_HEAD_MERGE) | |
935 | warning(_("reject %s because shallow roots are not allowed to be updated"), | |
936 | rm->peer_ref ? rm->peer_ref->name : rm->name); | |
937 | continue; | |
938 | } | |
939 | ||
21e1ee8f SB |
940 | commit = lookup_commit_reference_gently(the_repository, |
941 | &rm->old_oid, | |
bc83266a | 942 | 1); |
96890f4c | 943 | if (!commit) |
900f2814 | 944 | rm->fetch_head_status = FETCH_HEAD_NOT_FOR_MERGE; |
96890f4c | 945 | |
900f2814 | 946 | if (rm->fetch_head_status != want_status) |
96890f4c JH |
947 | continue; |
948 | ||
949 | if (rm->peer_ref) { | |
6f687c21 | 950 | ref = alloc_ref(rm->peer_ref->name); |
f4e54d02 | 951 | oidcpy(&ref->old_oid, &rm->peer_ref->old_oid); |
952 | oidcpy(&ref->new_oid, &rm->old_oid); | |
96890f4c JH |
953 | ref->force = rm->peer_ref->force; |
954 | } | |
b888d61c | 955 | |
be76c212 SB |
956 | if (recurse_submodules != RECURSE_SUBMODULES_OFF) |
957 | check_for_new_submodule_commits(&rm->old_oid); | |
b888d61c | 958 | |
96890f4c JH |
959 | if (!strcmp(rm->name, "HEAD")) { |
960 | kind = ""; | |
961 | what = ""; | |
962 | } | |
a6293f5d | 963 | else if (skip_prefix(rm->name, "refs/heads/", &what)) |
96890f4c | 964 | kind = "branch"; |
a6293f5d | 965 | else if (skip_prefix(rm->name, "refs/tags/", &what)) |
96890f4c | 966 | kind = "tag"; |
a6293f5d | 967 | else if (skip_prefix(rm->name, "refs/remotes/", &what)) |
96890f4c | 968 | kind = "remote-tracking branch"; |
96890f4c JH |
969 | else { |
970 | kind = ""; | |
971 | what = rm->name; | |
972 | } | |
b888d61c | 973 | |
96890f4c JH |
974 | url_len = strlen(url); |
975 | for (i = url_len - 1; url[i] == '/' && 0 <= i; i--) | |
976 | ; | |
977 | url_len = i + 1; | |
978 | if (4 < i && !strncmp(".git", url + i - 3, 4)) | |
979 | url_len = i - 3; | |
980 | ||
981 | strbuf_reset(¬e); | |
982 | if (*what) { | |
983 | if (*kind) | |
984 | strbuf_addf(¬e, "%s ", kind); | |
985 | strbuf_addf(¬e, "'%s' of ", what); | |
986 | } | |
900f2814 JK |
987 | switch (rm->fetch_head_status) { |
988 | case FETCH_HEAD_NOT_FOR_MERGE: | |
989 | merge_status_marker = "not-for-merge"; | |
990 | /* fall-through */ | |
991 | case FETCH_HEAD_MERGE: | |
992 | fprintf(fp, "%s\t%s\t%s", | |
f4e54d02 | 993 | oid_to_hex(&rm->old_oid), |
900f2814 JK |
994 | merge_status_marker, |
995 | note.buf); | |
996 | for (i = 0; i < url_len; ++i) | |
997 | if ('\n' == url[i]) | |
998 | fputs("\\n", fp); | |
999 | else | |
1000 | fputc(url[i], fp); | |
1001 | fputc('\n', fp); | |
1002 | break; | |
1003 | default: | |
1004 | /* do not write anything to FETCH_HEAD */ | |
1005 | break; | |
1006 | } | |
96890f4c JH |
1007 | |
1008 | strbuf_reset(¬e); | |
1009 | if (ref) { | |
901f3d40 JH |
1010 | rc |= update_local_ref(ref, what, rm, ¬e, |
1011 | summary_width); | |
96890f4c JH |
1012 | free(ref); |
1013 | } else | |
d0b39a03 NTND |
1014 | format_display(¬e, '*', |
1015 | *kind ? kind : "branch", NULL, | |
1016 | *what ? what : "HEAD", | |
901f3d40 | 1017 | "FETCH_HEAD", summary_width); |
96890f4c JH |
1018 | if (note.len) { |
1019 | if (verbosity >= 0 && !shown_url) { | |
1020 | fprintf(stderr, _("From %.*s\n"), | |
1021 | url_len, url); | |
1022 | shown_url = 1; | |
1023 | } | |
1024 | if (verbosity >= 0) | |
1025 | fprintf(stderr, " %s\n", note.buf); | |
165f3902 NP |
1026 | } |
1027 | } | |
b888d61c | 1028 | } |
9516a598 | 1029 | |
fa250759 | 1030 | if (rc & STORE_REF_ERROR_DF_CONFLICT) |
bd4a51fc | 1031 | error(_("some local refs could not be updated; try running\n" |
f3cb169b | 1032 | " 'git remote prune %s' to remove any old, conflicting " |
bd4a51fc | 1033 | "branches"), remote_name); |
9516a598 | 1034 | |
377444b4 DS |
1035 | if (advice_fetch_show_forced_updates) { |
1036 | if (!fetch_show_forced_updates) { | |
182f59da | 1037 | warning(_(warn_show_forced_updates)); |
377444b4 | 1038 | } else if (forced_updates_ms > FORCED_UPDATES_DELAY_WARNING_IN_MS) { |
182f59da | 1039 | warning(_(warn_time_show_forced_updates), |
377444b4 | 1040 | forced_updates_ms / 1000.0); |
377444b4 DS |
1041 | } |
1042 | } | |
1043 | ||
9516a598 | 1044 | abort: |
5914f2d0 | 1045 | strbuf_release(¬e); |
9516a598 TRC |
1046 | free(url); |
1047 | fclose(fp); | |
efb98b44 | 1048 | return rc; |
b888d61c DB |
1049 | } |
1050 | ||
4191c356 SP |
1051 | /* |
1052 | * We would want to bypass the object transfer altogether if | |
d9eb0205 | 1053 | * everything we are going to fetch already exists and is connected |
4191c356 | 1054 | * locally. |
4191c356 | 1055 | */ |
35f9e3e5 | 1056 | static int check_exist_and_connected(struct ref *ref_map) |
4191c356 | 1057 | { |
f0e278b1 | 1058 | struct ref *rm = ref_map; |
7043c707 | 1059 | struct check_connected_options opt = CHECK_CONNECTED_INIT; |
35f9e3e5 | 1060 | struct ref *r; |
f0e278b1 | 1061 | |
4191c356 SP |
1062 | /* |
1063 | * If we are deepening a shallow clone we already have these | |
1064 | * objects reachable. Running rev-list here will return with | |
1065 | * a good (0) exit status and we'll bypass the fetch that we | |
1066 | * really need to perform. Claiming failure now will ensure | |
1067 | * we perform the network exchange to deepen our history. | |
1068 | */ | |
508ea882 | 1069 | if (deepen) |
4191c356 | 1070 | return -1; |
35f9e3e5 JT |
1071 | |
1072 | /* | |
1073 | * check_connected() allows objects to merely be promised, but | |
1074 | * we need all direct targets to exist. | |
1075 | */ | |
1076 | for (r = rm; r; r = r->next) { | |
6462d5eb JT |
1077 | if (!has_object_file_with_flags(&r->old_oid, |
1078 | OBJECT_INFO_SKIP_FETCH_OBJECT)) | |
35f9e3e5 JT |
1079 | return -1; |
1080 | } | |
1081 | ||
7043c707 JK |
1082 | opt.quiet = 1; |
1083 | return check_connected(iterate_ref_map, &rm, &opt); | |
4191c356 SP |
1084 | } |
1085 | ||
e2842b39 | 1086 | static int fetch_refs(struct transport *transport, struct ref *ref_map) |
b888d61c | 1087 | { |
35f9e3e5 | 1088 | int ret = check_exist_and_connected(ref_map); |
5fc31180 JS |
1089 | if (ret) { |
1090 | trace2_region_enter("fetch", "fetch_refs", the_repository); | |
e2842b39 | 1091 | ret = transport_fetch_refs(transport, ref_map); |
5fc31180 JS |
1092 | trace2_region_leave("fetch", "fetch_refs", the_repository); |
1093 | } | |
b888d61c | 1094 | if (!ret) |
05c44226 BW |
1095 | /* |
1096 | * Keep the new pack's ".keep" file around to allow the caller | |
1097 | * time to update refs to reference the new objects. | |
1098 | */ | |
1099 | return 0; | |
1100 | transport_unlock_pack(transport); | |
1101 | return ret; | |
1102 | } | |
1103 | ||
1104 | /* Update local refs based on the ref values fetched from a remote */ | |
1105 | static int consume_refs(struct transport *transport, struct ref *ref_map) | |
1106 | { | |
cf1e7c07 JT |
1107 | int connectivity_checked = transport->smart_options |
1108 | ? transport->smart_options->connectivity_checked : 0; | |
5fc31180 JS |
1109 | int ret; |
1110 | trace2_region_enter("fetch", "consume_refs", the_repository); | |
1111 | ret = store_updated_refs(transport->url, | |
1112 | transport->remote->name, | |
1113 | connectivity_checked, | |
1114 | ref_map); | |
1788c39c | 1115 | transport_unlock_pack(transport); |
5fc31180 | 1116 | trace2_region_leave("fetch", "consume_refs", the_repository); |
b888d61c DB |
1117 | return ret; |
1118 | } | |
1119 | ||
def11e71 BW |
1120 | static int prune_refs(struct refspec *rs, struct ref *ref_map, |
1121 | const char *raw_url) | |
f360d844 | 1122 | { |
4b3b33a7 | 1123 | int url_len, i, result = 0; |
a2ac50cb | 1124 | struct ref *ref, *stale_refs = get_stale_heads(rs, ref_map); |
4b3b33a7 | 1125 | char *url; |
11fd66de | 1126 | int summary_width = transport_summary_width(stale_refs); |
f360d844 | 1127 | const char *dangling_msg = dry_run |
18986d53 NTND |
1128 | ? _(" (%s will become dangling)") |
1129 | : _(" (%s has become dangling)"); | |
f360d844 | 1130 | |
4b3b33a7 TM |
1131 | if (raw_url) |
1132 | url = transport_anonymize_url(raw_url); | |
1133 | else | |
1134 | url = xstrdup("foreign"); | |
1135 | ||
1136 | url_len = strlen(url); | |
1137 | for (i = url_len - 1; url[i] == '/' && 0 <= i; i--) | |
1138 | ; | |
1139 | ||
1140 | url_len = i + 1; | |
1141 | if (4 < i && !strncmp(".git", url + i - 3, 4)) | |
1142 | url_len = i - 3; | |
1143 | ||
a087b432 MH |
1144 | if (!dry_run) { |
1145 | struct string_list refnames = STRING_LIST_INIT_NODUP; | |
1146 | ||
1147 | for (ref = stale_refs; ref; ref = ref->next) | |
1148 | string_list_append(&refnames, ref->name); | |
1149 | ||
64da4199 | 1150 | result = delete_refs("fetch: prune", &refnames, 0); |
a087b432 MH |
1151 | string_list_clear(&refnames, 0); |
1152 | } | |
1153 | ||
1154 | if (verbosity >= 0) { | |
1155 | for (ref = stale_refs; ref; ref = ref->next) { | |
d0b39a03 | 1156 | struct strbuf sb = STRBUF_INIT; |
a087b432 MH |
1157 | if (!shown_url) { |
1158 | fprintf(stderr, _("From %.*s\n"), url_len, url); | |
1159 | shown_url = 1; | |
1160 | } | |
2cb040ba | 1161 | format_display(&sb, '-', _("[deleted]"), NULL, |
901f3d40 JH |
1162 | _("(none)"), prettify_refname(ref->name), |
1163 | summary_width); | |
d0b39a03 NTND |
1164 | fprintf(stderr, " %s\n",sb.buf); |
1165 | strbuf_release(&sb); | |
f360d844 JS |
1166 | warn_dangling_symref(stderr, dangling_msg, ref->name); |
1167 | } | |
1168 | } | |
a087b432 | 1169 | |
4b3b33a7 | 1170 | free(url); |
f360d844 JS |
1171 | free_refs(stale_refs); |
1172 | return result; | |
1173 | } | |
1174 | ||
8ee5d731 JS |
1175 | static void check_not_current_branch(struct ref *ref_map) |
1176 | { | |
1177 | struct branch *current_branch = branch_get(NULL); | |
1178 | ||
1179 | if (is_bare_repository() || !current_branch) | |
1180 | return; | |
1181 | ||
1182 | for (; ref_map; ref_map = ref_map->next) | |
1183 | if (ref_map->peer_ref && !strcmp(current_branch->refname, | |
1184 | ref_map->peer_ref->name)) | |
bd4a51fc ÆAB |
1185 | die(_("Refusing to fetch into current branch %s " |
1186 | "of non-bare repository"), current_branch->refname); | |
8ee5d731 JS |
1187 | } |
1188 | ||
e6cc5104 JH |
1189 | static int truncate_fetch_head(void) |
1190 | { | |
102de880 | 1191 | const char *filename = git_path_fetch_head(the_repository); |
ea56518d | 1192 | FILE *fp = fopen_for_writing(filename); |
e6cc5104 JH |
1193 | |
1194 | if (!fp) | |
6da31d7f | 1195 | return error_errno(_("cannot open %s"), filename); |
e6cc5104 JH |
1196 | fclose(fp); |
1197 | return 0; | |
1198 | } | |
1199 | ||
db5723c6 JH |
1200 | static void set_option(struct transport *transport, const char *name, const char *value) |
1201 | { | |
1202 | int r = transport_set_option(transport, name, value); | |
1203 | if (r < 0) | |
1204 | die(_("Option \"%s\" value \"%s\" is not valid for %s"), | |
1205 | name, value, transport->url); | |
1206 | if (r > 0) | |
1207 | warning(_("Option \"%s\" is ignored for %s\n"), | |
1208 | name, transport->url); | |
1209 | } | |
1210 | ||
3390e42a JT |
1211 | |
1212 | static int add_oid(const char *refname, const struct object_id *oid, int flags, | |
1213 | void *cb_data) | |
1214 | { | |
1215 | struct oid_array *oids = cb_data; | |
1216 | ||
1217 | oid_array_append(oids, oid); | |
1218 | return 0; | |
1219 | } | |
1220 | ||
1221 | static void add_negotiation_tips(struct git_transport_options *smart_options) | |
1222 | { | |
1223 | struct oid_array *oids = xcalloc(1, sizeof(*oids)); | |
1224 | int i; | |
1225 | ||
1226 | for (i = 0; i < negotiation_tip.nr; i++) { | |
1227 | const char *s = negotiation_tip.items[i].string; | |
1228 | int old_nr; | |
1229 | if (!has_glob_specials(s)) { | |
1230 | struct object_id oid; | |
1231 | if (get_oid(s, &oid)) | |
1232 | die("%s is not a valid object", s); | |
1233 | oid_array_append(oids, &oid); | |
1234 | continue; | |
1235 | } | |
1236 | old_nr = oids->nr; | |
1237 | for_each_glob_ref(add_oid, s, oids); | |
1238 | if (old_nr == oids->nr) | |
1239 | warning("Ignoring --negotiation-tip=%s because it does not match any refs", | |
1240 | s); | |
1241 | } | |
1242 | smart_options->negotiation_tips = oids; | |
1243 | } | |
1244 | ||
508ea882 | 1245 | static struct transport *prepare_transport(struct remote *remote, int deepen) |
db5723c6 JH |
1246 | { |
1247 | struct transport *transport; | |
87c2d9d3 | 1248 | |
db5723c6 JH |
1249 | transport = transport_get(remote, NULL); |
1250 | transport_set_verbosity(transport, verbosity, progress); | |
c915f11e | 1251 | transport->family = family; |
db5723c6 JH |
1252 | if (upload_pack) |
1253 | set_option(transport, TRANS_OPT_UPLOADPACK, upload_pack); | |
1254 | if (keep) | |
1255 | set_option(transport, TRANS_OPT_KEEP, "yes"); | |
1256 | if (depth) | |
1257 | set_option(transport, TRANS_OPT_DEPTH, depth); | |
508ea882 NTND |
1258 | if (deepen && deepen_since) |
1259 | set_option(transport, TRANS_OPT_DEEPEN_SINCE, deepen_since); | |
a45a2600 NTND |
1260 | if (deepen && deepen_not.nr) |
1261 | set_option(transport, TRANS_OPT_DEEPEN_NOT, | |
1262 | (const char *)&deepen_not); | |
cccf74e2 NTND |
1263 | if (deepen_relative) |
1264 | set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, "yes"); | |
48d25cae NTND |
1265 | if (update_shallow) |
1266 | set_option(transport, TRANS_OPT_UPDATE_SHALLOW, "yes"); | |
acb0c572 | 1267 | if (filter_options.choice) { |
cf9ceb5a MD |
1268 | const char *spec = |
1269 | expand_list_objects_filter_spec(&filter_options); | |
1270 | set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER, spec); | |
acb0c572 JH |
1271 | set_option(transport, TRANS_OPT_FROM_PROMISOR, "1"); |
1272 | } | |
3390e42a JT |
1273 | if (negotiation_tip.nr) { |
1274 | if (transport->smart_options) | |
1275 | add_negotiation_tips(transport->smart_options); | |
1276 | else | |
1277 | warning("Ignoring --negotiation-tip because the protocol does not support it."); | |
1278 | } | |
db5723c6 JH |
1279 | return transport; |
1280 | } | |
1281 | ||
069d5032 JH |
1282 | static void backfill_tags(struct transport *transport, struct ref *ref_map) |
1283 | { | |
508ea882 NTND |
1284 | int cannot_reuse; |
1285 | ||
1286 | /* | |
1287 | * Once we have set TRANS_OPT_DEEPEN_SINCE, we can't unset it | |
1288 | * when remote helper is used (setting it to an empty string | |
1289 | * is not unsetting). We could extend the remote helper | |
1290 | * protocol for that, but for now, just force a new connection | |
a45a2600 | 1291 | * without deepen-since. Similar story for deepen-not. |
508ea882 | 1292 | */ |
a45a2600 NTND |
1293 | cannot_reuse = transport->cannot_reuse || |
1294 | deepen_since || deepen_not.nr; | |
508ea882 NTND |
1295 | if (cannot_reuse) { |
1296 | gsecondary = prepare_transport(transport->remote, 0); | |
b26ed430 JH |
1297 | transport = gsecondary; |
1298 | } | |
1299 | ||
069d5032 JH |
1300 | transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL); |
1301 | transport_set_option(transport, TRANS_OPT_DEPTH, "0"); | |
cccf74e2 | 1302 | transport_set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, NULL); |
e2842b39 | 1303 | if (!fetch_refs(transport, ref_map)) |
05c44226 | 1304 | consume_refs(transport, ref_map); |
b26ed430 JH |
1305 | |
1306 | if (gsecondary) { | |
1307 | transport_disconnect(gsecondary); | |
1308 | gsecondary = NULL; | |
1309 | } | |
069d5032 JH |
1310 | } |
1311 | ||
b888d61c | 1312 | static int do_fetch(struct transport *transport, |
65a1301f | 1313 | struct refspec *rs) |
b888d61c | 1314 | { |
7f98428d | 1315 | struct ref *ref_map; |
b888d61c | 1316 | int autotags = (transport->remote->fetch_tags == 1); |
5b87d8d3 | 1317 | int retcode = 0; |
6d1700d5 BW |
1318 | const struct ref *remote_refs; |
1319 | struct argv_array ref_prefixes = ARGV_ARRAY_INIT; | |
e70a3030 | 1320 | int must_list_refs = 1; |
b1a01e1c | 1321 | |
ed368546 DJ |
1322 | if (tags == TAGS_DEFAULT) { |
1323 | if (transport->remote->fetch_tags == 2) | |
1324 | tags = TAGS_SET; | |
1325 | if (transport->remote->fetch_tags == -1) | |
1326 | tags = TAGS_UNSET; | |
1327 | } | |
b888d61c | 1328 | |
b888d61c | 1329 | /* if not appending, truncate FETCH_HEAD */ |
28a15401 | 1330 | if (!append && !dry_run) { |
5b87d8d3 MH |
1331 | retcode = truncate_fetch_head(); |
1332 | if (retcode) | |
1333 | goto cleanup; | |
d6617c7c | 1334 | } |
b888d61c | 1335 | |
e70a3030 JT |
1336 | if (rs->nr) { |
1337 | int i; | |
1338 | ||
6d1700d5 | 1339 | refspec_ref_prefixes(rs, &ref_prefixes); |
e70a3030 JT |
1340 | |
1341 | /* | |
1342 | * We can avoid listing refs if all of them are exact | |
1343 | * OIDs | |
1344 | */ | |
1345 | must_list_refs = 0; | |
1346 | for (i = 0; i < rs->nr; i++) { | |
1347 | if (!rs->items[i].exact_sha1) { | |
1348 | must_list_refs = 1; | |
1349 | break; | |
1350 | } | |
1351 | } | |
1352 | } else if (transport->remote && transport->remote->fetch.nr) | |
6d1700d5 | 1353 | refspec_ref_prefixes(&transport->remote->fetch, &ref_prefixes); |
b888d61c | 1354 | |
e70a3030 JT |
1355 | if (tags == TAGS_SET || tags == TAGS_DEFAULT) { |
1356 | must_list_refs = 1; | |
1357 | if (ref_prefixes.argc) | |
1358 | argv_array_push(&ref_prefixes, "refs/tags/"); | |
b888d61c DB |
1359 | } |
1360 | ||
5fc31180 JS |
1361 | if (must_list_refs) { |
1362 | trace2_region_enter("fetch", "remote_refs", the_repository); | |
e70a3030 | 1363 | remote_refs = transport_get_remote_refs(transport, &ref_prefixes); |
5fc31180 JS |
1364 | trace2_region_leave("fetch", "remote_refs", the_repository); |
1365 | } else | |
e70a3030 JT |
1366 | remote_refs = NULL; |
1367 | ||
6d1700d5 BW |
1368 | argv_array_clear(&ref_prefixes); |
1369 | ||
1370 | ref_map = get_ref_map(transport->remote, remote_refs, rs, | |
1371 | tags, &autotags); | |
8ee5d731 JS |
1372 | if (!update_head_ok) |
1373 | check_not_current_branch(ref_map); | |
b888d61c | 1374 | |
41fa7d2e SP |
1375 | if (tags == TAGS_DEFAULT && autotags) |
1376 | transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1"); | |
ed43de6e | 1377 | if (prune) { |
0838bf47 MH |
1378 | /* |
1379 | * We only prune based on refspecs specified | |
1380 | * explicitly (via command line or configuration); we | |
1381 | * don't care whether --tags was specified. | |
1382 | */ | |
65a1301f | 1383 | if (rs->nr) { |
def11e71 | 1384 | prune_refs(rs, ref_map, transport->url); |
e8c1e6c7 | 1385 | } else { |
def11e71 | 1386 | prune_refs(&transport->remote->fetch, |
4b3b33a7 TM |
1387 | ref_map, |
1388 | transport->url); | |
e8c1e6c7 | 1389 | } |
ed43de6e | 1390 | } |
e2842b39 | 1391 | if (fetch_refs(transport, ref_map) || consume_refs(transport, ref_map)) { |
10a6cc88 TM |
1392 | free_refs(ref_map); |
1393 | retcode = 1; | |
1394 | goto cleanup; | |
1395 | } | |
24bc1a12 CB |
1396 | |
1397 | if (set_upstream) { | |
1398 | struct branch *branch = branch_get("HEAD"); | |
1399 | struct ref *rm; | |
1400 | struct ref *source_ref = NULL; | |
1401 | ||
1402 | /* | |
1403 | * We're setting the upstream configuration for the | |
15beaaa3 | 1404 | * current branch. The relevant upstream is the |
24bc1a12 CB |
1405 | * fetched branch that is meant to be merged with the |
1406 | * current one, i.e. the one fetched to FETCH_HEAD. | |
1407 | * | |
1408 | * When there are several such branches, consider the | |
1409 | * request ambiguous and err on the safe side by doing | |
1410 | * nothing and just emit a warning. | |
1411 | */ | |
1412 | for (rm = ref_map; rm; rm = rm->next) { | |
1413 | if (!rm->peer_ref) { | |
1414 | if (source_ref) { | |
391c7e40 | 1415 | warning(_("multiple branches detected, incompatible with --set-upstream")); |
24bc1a12 CB |
1416 | goto skip; |
1417 | } else { | |
1418 | source_ref = rm; | |
1419 | } | |
1420 | } | |
1421 | } | |
1422 | if (source_ref) { | |
1423 | if (!strcmp(source_ref->name, "HEAD") || | |
1424 | starts_with(source_ref->name, "refs/heads/")) | |
1425 | install_branch_config(0, | |
1426 | branch->name, | |
1427 | transport->remote->name, | |
1428 | source_ref->name); | |
1429 | else if (starts_with(source_ref->name, "refs/remotes/")) | |
1430 | warning(_("not setting upstream for a remote remote-tracking branch")); | |
1431 | else if (starts_with(source_ref->name, "refs/tags/")) | |
1432 | warning(_("not setting upstream for a remote tag")); | |
1433 | else | |
1434 | warning(_("unknown branch type")); | |
1435 | } else { | |
1436 | warning(_("no source branch found.\n" | |
1437 | "you need to specify exactly one branch with the --set-upstream option.")); | |
1438 | } | |
1439 | } | |
1440 | skip: | |
7f98428d | 1441 | free_refs(ref_map); |
b888d61c DB |
1442 | |
1443 | /* if neither --no-tags nor --tags was specified, do automated tag | |
1444 | * following ... */ | |
83201998 | 1445 | if (tags == TAGS_DEFAULT && autotags) { |
c50b2b47 SP |
1446 | struct ref **tail = &ref_map; |
1447 | ref_map = NULL; | |
6d1700d5 | 1448 | find_non_local_tags(remote_refs, &ref_map, &tail); |
069d5032 JH |
1449 | if (ref_map) |
1450 | backfill_tags(transport, ref_map); | |
b888d61c DB |
1451 | free_refs(ref_map); |
1452 | } | |
1453 | ||
5b87d8d3 | 1454 | cleanup: |
5b87d8d3 | 1455 | return retcode; |
b888d61c DB |
1456 | } |
1457 | ||
9c4a036b BG |
1458 | static int get_one_remote_for_fetch(struct remote *remote, void *priv) |
1459 | { | |
1460 | struct string_list *list = priv; | |
7cc91a2f | 1461 | if (!remote->skip_default_update) |
1d2f80fa | 1462 | string_list_append(list, remote->name); |
9c4a036b BG |
1463 | return 0; |
1464 | } | |
1465 | ||
1466 | struct remote_group_data { | |
1467 | const char *name; | |
1468 | struct string_list *list; | |
1469 | }; | |
1470 | ||
1471 | static int get_remote_group(const char *key, const char *value, void *priv) | |
1472 | { | |
1473 | struct remote_group_data *g = priv; | |
1474 | ||
bc598c32 | 1475 | if (skip_prefix(key, "remotes.", &key) && !strcmp(key, g->name)) { |
9c4a036b | 1476 | /* split list by white space */ |
9c4a036b | 1477 | while (*value) { |
5f65499f MH |
1478 | size_t wordlen = strcspn(value, " \t\n"); |
1479 | ||
e286542d | 1480 | if (wordlen >= 1) |
b7410f61 | 1481 | string_list_append_nodup(g->list, |
e286542d MH |
1482 | xstrndup(value, wordlen)); |
1483 | value += wordlen + (value[wordlen] != '\0'); | |
9c4a036b BG |
1484 | } |
1485 | } | |
1486 | ||
1487 | return 0; | |
1488 | } | |
1489 | ||
1490 | static int add_remote_or_group(const char *name, struct string_list *list) | |
1491 | { | |
1492 | int prev_nr = list->nr; | |
66dbfd55 GV |
1493 | struct remote_group_data g; |
1494 | g.name = name; g.list = list; | |
9c4a036b BG |
1495 | |
1496 | git_config(get_remote_group, &g); | |
1497 | if (list->nr == prev_nr) { | |
674468b3 | 1498 | struct remote *remote = remote_get(name); |
e459b073 | 1499 | if (!remote_is_configured(remote, 0)) |
9c4a036b | 1500 | return 0; |
1d2f80fa | 1501 | string_list_append(list, remote->name); |
9c4a036b BG |
1502 | } |
1503 | return 1; | |
1504 | } | |
1505 | ||
85556d4e | 1506 | static void add_options_to_argv(struct argv_array *argv) |
9c4a036b | 1507 | { |
28a15401 | 1508 | if (dry_run) |
85556d4e | 1509 | argv_array_push(argv, "--dry-run"); |
90765fa3 MH |
1510 | if (prune != -1) |
1511 | argv_array_push(argv, prune ? "--prune" : "--no-prune"); | |
97716d21 ÆAB |
1512 | if (prune_tags != -1) |
1513 | argv_array_push(argv, prune_tags ? "--prune-tags" : "--no-prune-tags"); | |
bba5322a | 1514 | if (update_head_ok) |
85556d4e | 1515 | argv_array_push(argv, "--update-head-ok"); |
bba5322a | 1516 | if (force) |
85556d4e | 1517 | argv_array_push(argv, "--force"); |
bba5322a | 1518 | if (keep) |
85556d4e | 1519 | argv_array_push(argv, "--keep"); |
be254a0e | 1520 | if (recurse_submodules == RECURSE_SUBMODULES_ON) |
85556d4e | 1521 | argv_array_push(argv, "--recurse-submodules"); |
8f0700dd | 1522 | else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND) |
85556d4e | 1523 | argv_array_push(argv, "--recurse-submodules=on-demand"); |
85566460 DJ |
1524 | if (tags == TAGS_SET) |
1525 | argv_array_push(argv, "--tags"); | |
1526 | else if (tags == TAGS_UNSET) | |
1527 | argv_array_push(argv, "--no-tags"); | |
9c4a036b | 1528 | if (verbosity >= 2) |
85556d4e | 1529 | argv_array_push(argv, "-v"); |
9c4a036b | 1530 | if (verbosity >= 1) |
85556d4e | 1531 | argv_array_push(argv, "-v"); |
9c4a036b | 1532 | else if (verbosity < 0) |
85556d4e | 1533 | argv_array_push(argv, "-q"); |
7dce19d3 JL |
1534 | |
1535 | } | |
1536 | ||
d54dea77 JS |
1537 | /* Fetch multiple remotes in parallel */ |
1538 | ||
1539 | struct parallel_fetch_state { | |
1540 | const char **argv; | |
1541 | struct string_list *remotes; | |
1542 | int next, result; | |
1543 | }; | |
1544 | ||
1545 | static int fetch_next_remote(struct child_process *cp, struct strbuf *out, | |
1546 | void *cb, void **task_cb) | |
1547 | { | |
1548 | struct parallel_fetch_state *state = cb; | |
1549 | char *remote; | |
1550 | ||
1551 | if (state->next < 0 || state->next >= state->remotes->nr) | |
1552 | return 0; | |
1553 | ||
1554 | remote = state->remotes->items[state->next++].string; | |
1555 | *task_cb = remote; | |
1556 | ||
1557 | argv_array_pushv(&cp->args, state->argv); | |
1558 | argv_array_push(&cp->args, remote); | |
1559 | cp->git_cmd = 1; | |
1560 | ||
1561 | if (verbosity >= 0) | |
1562 | printf(_("Fetching %s\n"), remote); | |
1563 | ||
1564 | return 1; | |
1565 | } | |
1566 | ||
1567 | static int fetch_failed_to_start(struct strbuf *out, void *cb, void *task_cb) | |
1568 | { | |
1569 | struct parallel_fetch_state *state = cb; | |
1570 | const char *remote = task_cb; | |
1571 | ||
1572 | state->result = error(_("Could not fetch %s"), remote); | |
1573 | ||
1574 | return 0; | |
1575 | } | |
1576 | ||
1577 | static int fetch_finished(int result, struct strbuf *out, | |
1578 | void *cb, void *task_cb) | |
1579 | { | |
1580 | struct parallel_fetch_state *state = cb; | |
1581 | const char *remote = task_cb; | |
1582 | ||
1583 | if (result) { | |
1584 | strbuf_addf(out, _("could not fetch '%s' (exit code: %d)\n"), | |
1585 | remote, result); | |
1586 | state->result = -1; | |
1587 | } | |
1588 | ||
1589 | return 0; | |
1590 | } | |
1591 | ||
1592 | static int fetch_multiple(struct string_list *list, int max_children) | |
7dce19d3 JL |
1593 | { |
1594 | int i, result = 0; | |
85556d4e | 1595 | struct argv_array argv = ARGV_ARRAY_INIT; |
9c4a036b | 1596 | |
e6cc5104 JH |
1597 | if (!append && !dry_run) { |
1598 | int errcode = truncate_fetch_head(); | |
1599 | if (errcode) | |
1600 | return errcode; | |
1601 | } | |
1602 | ||
7d8e72b9 JS |
1603 | argv_array_pushl(&argv, "fetch", "--append", "--no-auto-gc", |
1604 | "--no-write-commit-graph", NULL); | |
85556d4e JK |
1605 | add_options_to_argv(&argv); |
1606 | ||
d54dea77 JS |
1607 | if (max_children != 1 && list->nr != 1) { |
1608 | struct parallel_fetch_state state = { argv.argv, list, 0, 0 }; | |
1609 | ||
1610 | argv_array_push(&argv, "--end-of-options"); | |
1611 | result = run_processes_parallel_tr2(max_children, | |
1612 | &fetch_next_remote, | |
1613 | &fetch_failed_to_start, | |
1614 | &fetch_finished, | |
1615 | &state, | |
1616 | "fetch", "parallel/fetch"); | |
1617 | ||
1618 | if (!result) | |
1619 | result = state.result; | |
1620 | } else | |
1621 | for (i = 0; i < list->nr; i++) { | |
1622 | const char *name = list->items[i].string; | |
1623 | argv_array_push(&argv, name); | |
1624 | if (verbosity >= 0) | |
1625 | printf(_("Fetching %s\n"), name); | |
1626 | if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) { | |
1627 | error(_("Could not fetch %s"), name); | |
1628 | result = 1; | |
1629 | } | |
1630 | argv_array_pop(&argv); | |
9c4a036b | 1631 | } |
9c4a036b | 1632 | |
85556d4e | 1633 | argv_array_clear(&argv); |
d54dea77 | 1634 | return !!result; |
9c4a036b BG |
1635 | } |
1636 | ||
aa57b871 JH |
1637 | /* |
1638 | * Fetching from the promisor remote should use the given filter-spec | |
1639 | * or inherit the default filter-spec from the config. | |
1640 | */ | |
1641 | static inline void fetch_one_setup_partial(struct remote *remote) | |
1642 | { | |
1643 | /* | |
1644 | * Explicit --no-filter argument overrides everything, regardless | |
1645 | * of any prior partial clones and fetches. | |
1646 | */ | |
1647 | if (filter_options.no_filter) | |
1648 | return; | |
1649 | ||
1650 | /* | |
1651 | * If no prior partial clone/fetch and the current fetch DID NOT | |
1652 | * request a partial-fetch, do a normal fetch. | |
1653 | */ | |
b14ed5ad | 1654 | if (!has_promisor_remote() && !filter_options.choice) |
aa57b871 JH |
1655 | return; |
1656 | ||
1657 | /* | |
5e461393 CC |
1658 | * If this is a partial-fetch request, we enable partial on |
1659 | * this repo if not already enabled and remember the given | |
1660 | * filter-spec as the default for subsequent fetches to this | |
1661 | * remote. | |
aa57b871 | 1662 | */ |
5e461393 | 1663 | if (filter_options.choice) { |
aa57b871 JH |
1664 | partial_clone_register(remote->name, &filter_options); |
1665 | return; | |
1666 | } | |
1667 | ||
aa57b871 JH |
1668 | /* |
1669 | * Do a partial-fetch from the promisor remote using either the | |
1670 | * explicitly given filter-spec or inherit the filter-spec from | |
1671 | * the config. | |
1672 | */ | |
1673 | if (!filter_options.choice) | |
fa3d1b63 | 1674 | partial_clone_get_default_filter_spec(&filter_options, remote->name); |
aa57b871 JH |
1675 | return; |
1676 | } | |
1677 | ||
97716d21 | 1678 | static int fetch_one(struct remote *remote, int argc, const char **argv, int prune_tags_ok) |
b888d61c | 1679 | { |
d7c8e307 BW |
1680 | struct refspec rs = REFSPEC_INIT_FETCH; |
1681 | int i; | |
7b7f39ea | 1682 | int exit_code; |
6317972c ÆAB |
1683 | int maybe_prune_tags; |
1684 | int remote_via_config = remote_is_configured(remote, 0); | |
b888d61c | 1685 | |
fa685bdf | 1686 | if (!remote) |
bd4a51fc ÆAB |
1687 | die(_("No remote repository specified. Please, specify either a URL or a\n" |
1688 | "remote name from which new revisions should be fetched.")); | |
fa685bdf | 1689 | |
508ea882 | 1690 | gtransport = prepare_transport(remote, 1); |
737c5a9c MS |
1691 | |
1692 | if (prune < 0) { | |
1693 | /* no command line request */ | |
07118832 ÆAB |
1694 | if (0 <= remote->prune) |
1695 | prune = remote->prune; | |
737c5a9c MS |
1696 | else if (0 <= fetch_prune_config) |
1697 | prune = fetch_prune_config; | |
1698 | else | |
1699 | prune = PRUNE_BY_DEFAULT; | |
1700 | } | |
1701 | ||
97716d21 ÆAB |
1702 | if (prune_tags < 0) { |
1703 | /* no command line request */ | |
1704 | if (0 <= remote->prune_tags) | |
1705 | prune_tags = remote->prune_tags; | |
1706 | else if (0 <= fetch_prune_tags_config) | |
1707 | prune_tags = fetch_prune_tags_config; | |
1708 | else | |
1709 | prune_tags = PRUNE_TAGS_BY_DEFAULT; | |
1710 | } | |
1711 | ||
6317972c ÆAB |
1712 | maybe_prune_tags = prune_tags_ok && prune_tags; |
1713 | if (maybe_prune_tags && remote_via_config) | |
95303500 | 1714 | refspec_append(&remote->fetch, TAG_REFSPEC); |
97716d21 | 1715 | |
d7c8e307 BW |
1716 | if (maybe_prune_tags && (argc || !remote_via_config)) |
1717 | refspec_append(&rs, TAG_REFSPEC); | |
6317972c | 1718 | |
d7c8e307 BW |
1719 | for (i = 0; i < argc; i++) { |
1720 | if (!strcmp(argv[i], "tag")) { | |
1721 | char *tag; | |
1722 | i++; | |
1723 | if (i >= argc) | |
1724 | die(_("You need to specify a tag name.")); | |
1725 | ||
1726 | tag = xstrfmt("refs/tags/%s:refs/tags/%s", | |
1727 | argv[i], argv[i]); | |
1728 | refspec_append(&rs, tag); | |
1729 | free(tag); | |
1730 | } else { | |
1731 | refspec_append(&rs, argv[i]); | |
b888d61c | 1732 | } |
b888d61c DB |
1733 | } |
1734 | ||
5e3548ef BW |
1735 | if (server_options.nr) |
1736 | gtransport->server_options = &server_options; | |
1737 | ||
57b235a4 | 1738 | sigchain_push_common(unlock_pack_on_signal); |
e4022ed2 | 1739 | atexit(unlock_pack); |
14358894 | 1740 | sigchain_push(SIGPIPE, SIG_IGN); |
65a1301f | 1741 | exit_code = do_fetch(gtransport, &rs); |
14358894 | 1742 | sigchain_pop(SIGPIPE); |
d7c8e307 | 1743 | refspec_clear(&rs); |
af234459 JH |
1744 | transport_disconnect(gtransport); |
1745 | gtransport = NULL; | |
7b7f39ea | 1746 | return exit_code; |
b888d61c | 1747 | } |
9c4a036b BG |
1748 | |
1749 | int cmd_fetch(int argc, const char **argv, const char *prefix) | |
1750 | { | |
1751 | int i; | |
b7410f61 | 1752 | struct string_list list = STRING_LIST_INIT_DUP; |
a1743343 | 1753 | struct remote *remote = NULL; |
9c4a036b | 1754 | int result = 0; |
c1a7902f | 1755 | int prune_tags_ok = 1; |
9c4a036b | 1756 | |
bbc30f99 JK |
1757 | packet_trace_identity("fetch"); |
1758 | ||
9c4a036b BG |
1759 | /* Record the command line for the reflog */ |
1760 | strbuf_addstr(&default_rla, "fetch"); | |
46da295a JS |
1761 | for (i = 1; i < argc; i++) { |
1762 | /* This handles non-URLs gracefully */ | |
1763 | char *anon = transport_anonymize_url(argv[i]); | |
1764 | ||
1765 | strbuf_addf(&default_rla, " %s", anon); | |
1766 | free(anon); | |
1767 | } | |
9c4a036b | 1768 | |
d54dea77 JS |
1769 | fetch_config_from_gitmodules(&submodule_fetch_jobs_config, |
1770 | &recurse_submodules); | |
737c5a9c MS |
1771 | git_config(git_fetch_config, NULL); |
1772 | ||
9c4a036b BG |
1773 | argc = parse_options(argc, argv, prefix, |
1774 | builtin_fetch_options, builtin_fetch_usage, 0); | |
1775 | ||
cccf74e2 NTND |
1776 | if (deepen_relative) { |
1777 | if (deepen_relative < 0) | |
1778 | die(_("Negative depth in --deepen is not supported")); | |
1779 | if (depth) | |
1780 | die(_("--deepen and --depth are mutually exclusive")); | |
1781 | depth = xstrfmt("%d", deepen_relative); | |
1782 | } | |
4dcb167f NTND |
1783 | if (unshallow) { |
1784 | if (depth) | |
1785 | die(_("--depth and --unshallow cannot be used together")); | |
c8813487 | 1786 | else if (!is_repository_shallow(the_repository)) |
4dcb167f | 1787 | die(_("--unshallow on a complete repository does not make sense")); |
2805bb59 JK |
1788 | else |
1789 | depth = xstrfmt("%d", INFINITE_DEPTH); | |
4dcb167f NTND |
1790 | } |
1791 | ||
5594bcad NTND |
1792 | /* no need to be strict, transport_set_option() will validate it again */ |
1793 | if (depth && atoi(depth) < 1) | |
1794 | die(_("depth %s is not a positive number"), depth); | |
a45a2600 | 1795 | if (depth || deepen_since || deepen_not.nr) |
508ea882 | 1796 | deepen = 1; |
5594bcad | 1797 | |
9c4a036b BG |
1798 | if (all) { |
1799 | if (argc == 1) | |
bd4a51fc | 1800 | die(_("fetch --all does not take a repository argument")); |
9c4a036b | 1801 | else if (argc > 1) |
bd4a51fc | 1802 | die(_("fetch --all does not make sense with refspecs")); |
9c4a036b | 1803 | (void) for_each_remote(get_one_remote_for_fetch, &list); |
9c4a036b BG |
1804 | } else if (argc == 0) { |
1805 | /* No arguments -- use default remote */ | |
1806 | remote = remote_get(NULL); | |
16679e37 BG |
1807 | } else if (multiple) { |
1808 | /* All arguments are assumed to be remotes or groups */ | |
1809 | for (i = 0; i < argc; i++) | |
1810 | if (!add_remote_or_group(argv[i], &list)) | |
bd4a51fc | 1811 | die(_("No such remote or remote group: %s"), argv[i]); |
9c4a036b BG |
1812 | } else { |
1813 | /* Single remote or group */ | |
1814 | (void) add_remote_or_group(argv[0], &list); | |
1815 | if (list.nr > 1) { | |
1816 | /* More than one remote */ | |
1817 | if (argc > 1) | |
bd4a51fc | 1818 | die(_("Fetching a group and specifying refspecs does not make sense")); |
9c4a036b BG |
1819 | } else { |
1820 | /* Zero or one remotes */ | |
1821 | remote = remote_get(argv[0]); | |
c1a7902f | 1822 | prune_tags_ok = (argc == 1); |
a1743343 JT |
1823 | argc--; |
1824 | argv++; | |
9c4a036b BG |
1825 | } |
1826 | } | |
1827 | ||
acb0c572 | 1828 | if (remote) { |
b14ed5ad | 1829 | if (filter_options.choice || has_promisor_remote()) |
aa57b871 | 1830 | fetch_one_setup_partial(remote); |
c1a7902f | 1831 | result = fetch_one(remote, argc, argv, prune_tags_ok); |
acb0c572 | 1832 | } else { |
d54dea77 JS |
1833 | int max_children = max_jobs; |
1834 | ||
acb0c572 | 1835 | if (filter_options.choice) |
e0137875 CC |
1836 | die(_("--filter can only be used with the remote " |
1837 | "configured in extensions.partialclone")); | |
d54dea77 JS |
1838 | |
1839 | if (max_children < 0) | |
1840 | max_children = fetch_parallel_config; | |
1841 | ||
aa57b871 | 1842 | /* TODO should this also die if we have a previous partial-clone? */ |
d54dea77 | 1843 | result = fetch_multiple(&list, max_children); |
acb0c572 | 1844 | } |
a1743343 | 1845 | |
be254a0e | 1846 | if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) { |
85556d4e | 1847 | struct argv_array options = ARGV_ARRAY_INIT; |
d54dea77 JS |
1848 | int max_children = max_jobs; |
1849 | ||
1850 | if (max_children < 0) | |
1851 | max_children = submodule_fetch_jobs_config; | |
1852 | if (max_children < 0) | |
1853 | max_children = fetch_parallel_config; | |
85556d4e JK |
1854 | |
1855 | add_options_to_argv(&options); | |
e724197f BW |
1856 | result = fetch_populated_submodules(the_repository, |
1857 | &options, | |
7dce19d3 | 1858 | submodule_prefix, |
8f0700dd | 1859 | recurse_submodules, |
8fa29159 | 1860 | recurse_submodules_default, |
62104ba1 SB |
1861 | verbosity < 0, |
1862 | max_children); | |
85556d4e | 1863 | argv_array_clear(&options); |
7dce19d3 JL |
1864 | } |
1865 | ||
9c4a036b BG |
1866 | string_list_clear(&list, 0); |
1867 | ||
50f26bd0 | 1868 | prepare_repo_settings(the_repository); |
c14e6e79 JS |
1869 | if (fetch_write_commit_graph > 0 || |
1870 | (fetch_write_commit_graph < 0 && | |
1871 | the_repository->settings.fetch_write_commit_graph)) { | |
5a535094 | 1872 | int commit_graph_flags = COMMIT_GRAPH_WRITE_SPLIT; |
50f26bd0 DS |
1873 | |
1874 | if (progress) | |
5a535094 | 1875 | commit_graph_flags |= COMMIT_GRAPH_WRITE_PROGRESS; |
50f26bd0 | 1876 | |
0bd52e27 | 1877 | write_commit_graph_reachable(the_repository->objects->odb, |
50f26bd0 | 1878 | commit_graph_flags, |
63020f17 | 1879 | NULL); |
50f26bd0 DS |
1880 | } |
1881 | ||
2d511cfc | 1882 | close_object_store(the_repository->objects); |
0898c962 | 1883 | |
850b6ede JH |
1884 | if (enable_auto_gc) |
1885 | run_auto_gc(verbosity < 0); | |
131b8fcb | 1886 | |
9c4a036b BG |
1887 | return result; |
1888 | } |