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