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