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