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