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