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