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