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