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