fetch: add --[no-]show-forced-updates argument
[git/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 41static int fetch_prune_config = -1; /* unspecified */
cdbd70c4 42static int fetch_show_forced_updates = 1;
737c5a9c
MS
43static int prune = -1; /* unspecified */
44#define PRUNE_BY_DEFAULT 0 /* do we prune by default? */
45
97716d21
ÆAB
46static int fetch_prune_tags_config = -1; /* unspecified */
47static int prune_tags = -1; /* unspecified */
48#define PRUNE_TAGS_BY_DEFAULT 0 /* do we prune tags by default? */
49
cccf74e2 50static int all, append, dry_run, force, keep, multiple, update_head_ok, verbosity, deepen_relative;
8c69832d 51static int progress = -1;
508ea882 52static int tags = TAGS_DEFAULT, unshallow, update_shallow, deepen;
f20e7c1e 53static int max_children = 1;
c915f11e 54static enum transport_family family;
4191c356 55static const char *depth;
508ea882 56static const char *deepen_since;
83201998 57static const char *upload_pack;
a45a2600 58static struct string_list deepen_not = STRING_LIST_INIT_NODUP;
2d324efa 59static struct strbuf default_rla = STRBUF_INIT;
af234459 60static struct transport *gtransport;
b26ed430 61static struct transport *gsecondary;
7dce19d3 62static const char *submodule_prefix = "";
8c69832d 63static int recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
e8906a90 64static int recurse_submodules_default = RECURSE_SUBMODULES_ON_DEMAND;
4b3b33a7 65static int shown_url = 0;
e4cffacc 66static struct refspec refmap = REFSPEC_INIT_FETCH;
acb0c572 67static struct list_objects_filter_options filter_options;
5e3548ef 68static struct string_list server_options = STRING_LIST_INIT_DUP;
3390e42a 69static struct string_list negotiation_tip = STRING_LIST_INIT_NODUP;
e4022ed2 70
737c5a9c
MS
71static int git_fetch_config(const char *k, const char *v, void *cb)
72{
73 if (!strcmp(k, "fetch.prune")) {
74 fetch_prune_config = git_config_bool(k, v);
75 return 0;
76 }
58f4203e 77
97716d21
ÆAB
78 if (!strcmp(k, "fetch.prunetags")) {
79 fetch_prune_tags_config = git_config_bool(k, v);
80 return 0;
81 }
82
cdbd70c4
DS
83 if (!strcmp(k, "fetch.showforcedupdates")) {
84 fetch_show_forced_updates = git_config_bool(k, v);
85 return 0;
86 }
87
58f4203e
SB
88 if (!strcmp(k, "submodule.recurse")) {
89 int r = git_config_bool(k, v) ?
90 RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;
91 recurse_submodules = r;
92 }
93
f20e7c1e
BW
94 if (!strcmp(k, "submodule.fetchjobs")) {
95 max_children = parse_submodule_fetchjobs(k, v);
96 return 0;
8fa29159
BW
97 } else if (!strcmp(k, "fetch.recursesubmodules")) {
98 recurse_submodules = parse_fetch_recurse_submodules_arg(k, v);
99 return 0;
f20e7c1e
BW
100 }
101
72549dfd 102 return git_default_config(k, v, cb);
737c5a9c
MS
103}
104
c5558f80
JH
105static int parse_refmap_arg(const struct option *opt, const char *arg, int unset)
106{
517fe807
JK
107 BUG_ON_OPT_NEG(unset);
108
c5558f80
JH
109 /*
110 * "git fetch --refmap='' origin foo"
111 * can be used to tell the command not to store anywhere
112 */
e4cffacc
BW
113 refspec_append(&refmap, arg);
114
c5558f80
JH
115 return 0;
116}
117
83201998 118static struct option builtin_fetch_options[] = {
7f87aff2 119 OPT__VERBOSITY(&verbosity),
d5d09d47
SB
120 OPT_BOOL(0, "all", &all,
121 N_("fetch from all remotes")),
122 OPT_BOOL('a', "append", &append,
123 N_("append to .git/FETCH_HEAD instead of overwriting")),
719acedb
NTND
124 OPT_STRING(0, "upload-pack", &upload_pack, N_("path"),
125 N_("path to upload pack on remote end")),
8cd4b7c1 126 OPT__FORCE(&force, N_("force overwrite of local reference"), 0),
d5d09d47
SB
127 OPT_BOOL('m', "multiple", &multiple,
128 N_("fetch from multiple remotes")),
83201998 129 OPT_SET_INT('t', "tags", &tags,
719acedb 130 N_("fetch all tags and associated objects"), TAGS_SET),
e7951290 131 OPT_SET_INT('n', NULL, &tags,
719acedb 132 N_("do not fetch all tags (--no-tags)"), TAGS_UNSET),
62104ba1
SB
133 OPT_INTEGER('j', "jobs", &max_children,
134 N_("number of submodules fetched in parallel")),
d5d09d47
SB
135 OPT_BOOL('p', "prune", &prune,
136 N_("prune remote-tracking branches no longer on remote")),
97716d21
ÆAB
137 OPT_BOOL('P', "prune-tags", &prune_tags,
138 N_("prune local tags no longer on remote and clobber changed tags")),
886dc154 139 { OPTION_CALLBACK, 0, "recurse-submodules", &recurse_submodules, N_("on-demand"),
719acedb 140 N_("control recursive fetching of submodules"),
886dc154 141 PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules },
d5d09d47
SB
142 OPT_BOOL(0, "dry-run", &dry_run,
143 N_("dry run")),
144 OPT_BOOL('k', "keep", &keep, N_("keep downloaded pack")),
145 OPT_BOOL('u', "update-head-ok", &update_head_ok,
719acedb
NTND
146 N_("allow updating of HEAD ref")),
147 OPT_BOOL(0, "progress", &progress, N_("force progress reporting")),
148 OPT_STRING(0, "depth", &depth, N_("depth"),
149 N_("deepen history of shallow clone")),
508ea882
NTND
150 OPT_STRING(0, "shallow-since", &deepen_since, N_("time"),
151 N_("deepen history of shallow repository based on time")),
a45a2600 152 OPT_STRING_LIST(0, "shallow-exclude", &deepen_not, N_("revision"),
6d873865 153 N_("deepen history of shallow clone, excluding rev")),
cccf74e2
NTND
154 OPT_INTEGER(0, "deepen", &deepen_relative,
155 N_("deepen history of shallow clone")),
3e4a67b4
NTND
156 OPT_SET_INT_F(0, "unshallow", &unshallow,
157 N_("convert to a complete repository"),
158 1, PARSE_OPT_NONEG),
719acedb
NTND
159 { OPTION_STRING, 0, "submodule-prefix", &submodule_prefix, N_("dir"),
160 N_("prepend this to submodule path output"), PARSE_OPT_HIDDEN },
8c69832d
SB
161 { OPTION_CALLBACK, 0, "recurse-submodules-default",
162 &recurse_submodules_default, N_("on-demand"),
163 N_("default for recursive fetching of submodules "
164 "(lower priority than config files)"),
165 PARSE_OPT_HIDDEN, option_fetch_parse_recurse_submodules },
48d25cae
NTND
166 OPT_BOOL(0, "update-shallow", &update_shallow,
167 N_("accept refs that update .git/shallow")),
c5558f80
JH
168 { OPTION_CALLBACK, 0, "refmap", NULL, N_("refmap"),
169 N_("specify fetch refmap"), PARSE_OPT_NONEG, parse_refmap_arg },
5e3548ef 170 OPT_STRING_LIST('o', "server-option", &server_options, N_("server-specific"), N_("option to transmit")),
c915f11e
EW
171 OPT_SET_INT('4', "ipv4", &family, N_("use IPv4 addresses only"),
172 TRANSPORT_FAMILY_IPV4),
173 OPT_SET_INT('6', "ipv6", &family, N_("use IPv6 addresses only"),
174 TRANSPORT_FAMILY_IPV6),
3390e42a
JT
175 OPT_STRING_LIST(0, "negotiation-tip", &negotiation_tip, N_("revision"),
176 N_("report that we have only objects reachable from this object")),
acb0c572 177 OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options),
cdbd70c4
DS
178 OPT_BOOL(0, "show-forced-updates", &fetch_show_forced_updates,
179 N_("check for forced-updates on all updated branches")),
83201998
KH
180 OPT_END()
181};
182
e4022ed2
SP
183static void unlock_pack(void)
184{
af234459
JH
185 if (gtransport)
186 transport_unlock_pack(gtransport);
b26ed430
JH
187 if (gsecondary)
188 transport_unlock_pack(gsecondary);
e4022ed2
SP
189}
190
191static void unlock_pack_on_signal(int signo)
192{
193 unlock_pack();
4a16d072 194 sigchain_pop(signo);
e4022ed2
SP
195 raise(signo);
196}
b888d61c 197
85682c19 198static void add_merge_config(struct ref **head,
4577370e 199 const struct ref *remote_refs,
85682c19
SP
200 struct branch *branch,
201 struct ref ***tail)
b888d61c 202{
85682c19 203 int i;
b888d61c 204
85682c19
SP
205 for (i = 0; i < branch->merge_nr; i++) {
206 struct ref *rm, **old_tail = *tail;
0ad4a5ff 207 struct refspec_item refspec;
85682c19
SP
208
209 for (rm = *head; rm; rm = rm->next) {
210 if (branch_merge_matches(branch, i, rm->name)) {
900f2814 211 rm->fetch_head_status = FETCH_HEAD_MERGE;
85682c19
SP
212 break;
213 }
b888d61c 214 }
85682c19
SP
215 if (rm)
216 continue;
217
9ad7c5ae 218 /*
8b3f3f84 219 * Not fetched to a remote-tracking branch? We need to fetch
85682c19 220 * it anyway to allow this branch's "branch.$name.merge"
05207a28 221 * to be honored by 'git pull', but we do not have to
9ad7c5ae
JH
222 * fail if branch.$name.merge is misconfigured to point
223 * at a nonexisting branch. If we were indeed called by
05207a28 224 * 'git pull', it will notice the misconfiguration because
9ad7c5ae
JH
225 * there is no entry in the resulting FETCH_HEAD marked
226 * for merging.
85682c19 227 */
8da61a2a 228 memset(&refspec, 0, sizeof(refspec));
85682c19 229 refspec.src = branch->merge[i]->src;
9ad7c5ae 230 get_fetch_map(remote_refs, &refspec, tail, 1);
85682c19 231 for (rm = *old_tail; rm; rm = rm->next)
900f2814 232 rm->fetch_head_status = FETCH_HEAD_MERGE;
b888d61c
DB
233 }
234}
235
a0fbb5a3
MH
236static int will_fetch(struct ref **head, const unsigned char *sha1)
237{
238 struct ref *rm = *head;
239 while (rm) {
e3ff0683 240 if (hasheq(rm->old_oid.hash, sha1))
a0fbb5a3
MH
241 return 1;
242 rm = rm->next;
243 }
244 return 0;
245}
246
e198b3a7
JH
247struct refname_hash_entry {
248 struct hashmap_entry ent; /* must be the first member */
249 struct object_id oid;
250 char refname[FLEX_ARRAY];
251};
252
253static int refname_hash_entry_cmp(const void *hashmap_cmp_fn_data,
254 const void *e1_,
255 const void *e2_,
256 const void *keydata)
257{
258 const struct refname_hash_entry *e1 = e1_;
259 const struct refname_hash_entry *e2 = e2_;
260
261 return strcmp(e1->refname, keydata ? keydata : e2->refname);
262}
263
264static struct refname_hash_entry *refname_hash_add(struct hashmap *map,
265 const char *refname,
266 const struct object_id *oid)
267{
268 struct refname_hash_entry *ent;
269 size_t len = strlen(refname);
270
271 FLEX_ALLOC_MEM(ent, refname, refname, len);
272 hashmap_entry_init(ent, strhash(refname));
273 oidcpy(&ent->oid, oid);
274 hashmap_add(map, ent);
275 return ent;
276}
277
278static int add_one_refname(const char *refname,
279 const struct object_id *oid,
280 int flag, void *cbdata)
281{
282 struct hashmap *refname_map = cbdata;
283
284 (void) refname_hash_add(refname_map, refname, oid);
285 return 0;
286}
287
288static void refname_hash_init(struct hashmap *map)
289{
290 hashmap_init(map, refname_hash_entry_cmp, NULL, 0);
291}
292
293static int refname_hash_exists(struct hashmap *map, const char *refname)
294{
295 return !!hashmap_get_from_hash(map, strhash(refname), refname);
296}
297
6d1700d5
BW
298static void find_non_local_tags(const struct ref *refs,
299 struct ref **head,
300 struct ref ***tail)
a0fbb5a3 301{
e198b3a7
JH
302 struct hashmap existing_refs;
303 struct hashmap remote_refs;
304 struct string_list remote_refs_list = STRING_LIST_INIT_NODUP;
305 struct string_list_item *remote_ref_item;
a0fbb5a3 306 const struct ref *ref;
e198b3a7
JH
307 struct refname_hash_entry *item = NULL;
308
309 refname_hash_init(&existing_refs);
310 refname_hash_init(&remote_refs);
a0fbb5a3 311
e198b3a7 312 for_each_ref(add_one_refname, &existing_refs);
6d1700d5 313 for (ref = refs; ref; ref = ref->next) {
ad704485 314 if (!starts_with(ref->name, "refs/tags/"))
a0fbb5a3
MH
315 continue;
316
317 /*
318 * The peeled ref always follows the matching base
319 * ref, so if we see a peeled ref that we don't want
320 * to fetch then we can mark the ref entry in the list
321 * as one to ignore by setting util to NULL.
322 */
ad704485 323 if (ends_with(ref->name, "^{}")) {
5827a035 324 if (item &&
e83e71c5
JT
325 !has_object_file_with_flags(&ref->old_oid,
326 OBJECT_INFO_QUICK) &&
f4e54d02 327 !will_fetch(head, ref->old_oid.hash) &&
98374a07 328 !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) &&
e198b3a7
JH
329 !will_fetch(head, item->oid.hash))
330 oidclr(&item->oid);
a0fbb5a3
MH
331 item = NULL;
332 continue;
333 }
334
335 /*
336 * If item is non-NULL here, then we previously saw a
337 * ref not followed by a peeled reference, so we need
338 * to check if it is a lightweight tag that we want to
339 * fetch.
340 */
5827a035 341 if (item &&
98374a07 342 !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) &&
e198b3a7
JH
343 !will_fetch(head, item->oid.hash))
344 oidclr(&item->oid);
a0fbb5a3
MH
345
346 item = NULL;
347
348 /* skip duplicates and refs that we already have */
e198b3a7
JH
349 if (refname_hash_exists(&remote_refs, ref->name) ||
350 refname_hash_exists(&existing_refs, ref->name))
a0fbb5a3
MH
351 continue;
352
e198b3a7
JH
353 item = refname_hash_add(&remote_refs, ref->name, &ref->old_oid);
354 string_list_insert(&remote_refs_list, ref->name);
a0fbb5a3 355 }
e198b3a7 356 hashmap_free(&existing_refs, 1);
a0fbb5a3
MH
357
358 /*
359 * We may have a final lightweight tag that needs to be
360 * checked to see if it needs fetching.
361 */
5827a035 362 if (item &&
98374a07 363 !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) &&
e198b3a7
JH
364 !will_fetch(head, item->oid.hash))
365 oidclr(&item->oid);
a0fbb5a3
MH
366
367 /*
e198b3a7 368 * For all the tags in the remote_refs_list,
a0fbb5a3
MH
369 * add them to the list of refs to be fetched
370 */
e198b3a7
JH
371 for_each_string_list_item(remote_ref_item, &remote_refs_list) {
372 const char *refname = remote_ref_item->string;
373
374 item = hashmap_get_from_hash(&remote_refs, strhash(refname), refname);
375 if (!item)
376 BUG("unseen remote ref?");
377
a0fbb5a3 378 /* Unless we have already decided to ignore this item... */
e198b3a7
JH
379 if (!is_null_oid(&item->oid)) {
380 struct ref *rm = alloc_ref(item->refname);
381 rm->peer_ref = alloc_ref(item->refname);
382 oidcpy(&rm->old_oid, &item->oid);
a0fbb5a3
MH
383 **tail = rm;
384 *tail = &rm->next;
385 }
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
cdbd70c4 784 if (!fetch_show_forced_updates || in_merge_bases(current, updated)) {
bd22d4ff 785 struct strbuf quickref = STRBUF_INIT;
6315472e 786 int r;
cdbd70c4 787
30e677e0 788 strbuf_add_unique_abbrev(&quickref, &current->object.oid, DEFAULT_ABBREV);
bd22d4ff 789 strbuf_addstr(&quickref, "..");
30e677e0 790 strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
a75d7b54 791 r = s_update_ref("fast-forward", ref, 1);
d0b39a03
NTND
792 format_display(display, r ? '!' : ' ', quickref.buf,
793 r ? _("unable to update local ref") : NULL,
901f3d40 794 remote, pretty_ref, summary_width);
bd22d4ff 795 strbuf_release(&quickref);
6315472e 796 return r;
165f3902 797 } else if (force || ref->force) {
bd22d4ff 798 struct strbuf quickref = STRBUF_INIT;
6315472e 799 int r;
30e677e0 800 strbuf_add_unique_abbrev(&quickref, &current->object.oid, DEFAULT_ABBREV);
bd22d4ff 801 strbuf_addstr(&quickref, "...");
30e677e0 802 strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
6315472e 803 r = s_update_ref("forced-update", ref, 1);
d0b39a03
NTND
804 format_display(display, r ? '!' : '+', quickref.buf,
805 r ? _("unable to update local ref") : _("forced update"),
901f3d40 806 remote, pretty_ref, summary_width);
bd22d4ff 807 strbuf_release(&quickref);
6315472e 808 return r;
165f3902 809 } else {
d0b39a03 810 format_display(display, '!', _("[rejected]"), _("non-fast-forward"),
901f3d40 811 remote, pretty_ref, summary_width);
b888d61c
DB
812 return 1;
813 }
b888d61c
DB
814}
815
6ccac9ee 816static int iterate_ref_map(void *cb_data, struct object_id *oid)
6b67e0dc 817{
f0e278b1
JH
818 struct ref **rm = cb_data;
819 struct ref *ref = *rm;
6b67e0dc 820
4820a33b
NTND
821 while (ref && ref->status == REF_STATUS_REJECT_SHALLOW)
822 ref = ref->next;
f0e278b1
JH
823 if (!ref)
824 return -1; /* end of the list */
825 *rm = ref->next;
6ccac9ee 826 oidcpy(oid, &ref->old_oid);
f0e278b1 827 return 0;
6b67e0dc
JH
828}
829
47abd85b 830static int store_updated_refs(const char *raw_url, const char *remote_name,
cf1e7c07 831 int connectivity_checked, struct ref *ref_map)
b888d61c
DB
832{
833 FILE *fp;
834 struct commit *commit;
4b3b33a7 835 int url_len, i, rc = 0;
5914f2d0 836 struct strbuf note = STRBUF_INIT;
b888d61c
DB
837 const char *what, *kind;
838 struct ref *rm;
dcf69262 839 char *url;
102de880 840 const char *filename = dry_run ? "/dev/null" : git_path_fetch_head(the_repository);
900f2814 841 int want_status;
11fd66de 842 int summary_width = transport_summary_width(ref_map);
b888d61c 843
d6617c7c
AGR
844 fp = fopen(filename, "a");
845 if (!fp)
6da31d7f 846 return error_errno(_("cannot open %s"), filename);
47abd85b 847
fb0cc87e
DB
848 if (raw_url)
849 url = transport_anonymize_url(raw_url);
850 else
851 url = xstrdup("foreign");
6b67e0dc 852
cf1e7c07
JT
853 if (!connectivity_checked) {
854 rm = ref_map;
855 if (check_connected(iterate_ref_map, &rm, NULL)) {
856 rc = error(_("%s did not send all necessary objects\n"), url);
857 goto abort;
858 }
9516a598 859 }
6b67e0dc 860
6bc91f23
NTND
861 prepare_format_display(ref_map);
862
96890f4c 863 /*
900f2814
JK
864 * We do a pass for each fetch_head_status type in their enum order, so
865 * merged entries are written before not-for-merge. That lets readers
866 * use FETCH_HEAD as a refname to refer to the ref to be merged.
96890f4c 867 */
900f2814
JK
868 for (want_status = FETCH_HEAD_MERGE;
869 want_status <= FETCH_HEAD_IGNORE;
870 want_status++) {
96890f4c
JH
871 for (rm = ref_map; rm; rm = rm->next) {
872 struct ref *ref = NULL;
900f2814 873 const char *merge_status_marker = "";
96890f4c 874
4820a33b
NTND
875 if (rm->status == REF_STATUS_REJECT_SHALLOW) {
876 if (want_status == FETCH_HEAD_MERGE)
877 warning(_("reject %s because shallow roots are not allowed to be updated"),
878 rm->peer_ref ? rm->peer_ref->name : rm->name);
879 continue;
880 }
881
21e1ee8f
SB
882 commit = lookup_commit_reference_gently(the_repository,
883 &rm->old_oid,
bc83266a 884 1);
96890f4c 885 if (!commit)
900f2814 886 rm->fetch_head_status = FETCH_HEAD_NOT_FOR_MERGE;
96890f4c 887
900f2814 888 if (rm->fetch_head_status != want_status)
96890f4c
JH
889 continue;
890
891 if (rm->peer_ref) {
6f687c21 892 ref = alloc_ref(rm->peer_ref->name);
f4e54d02 893 oidcpy(&ref->old_oid, &rm->peer_ref->old_oid);
894 oidcpy(&ref->new_oid, &rm->old_oid);
96890f4c
JH
895 ref->force = rm->peer_ref->force;
896 }
b888d61c 897
be76c212
SB
898 if (recurse_submodules != RECURSE_SUBMODULES_OFF)
899 check_for_new_submodule_commits(&rm->old_oid);
b888d61c 900
96890f4c
JH
901 if (!strcmp(rm->name, "HEAD")) {
902 kind = "";
903 what = "";
904 }
59556548 905 else if (starts_with(rm->name, "refs/heads/")) {
96890f4c
JH
906 kind = "branch";
907 what = rm->name + 11;
908 }
59556548 909 else if (starts_with(rm->name, "refs/tags/")) {
96890f4c
JH
910 kind = "tag";
911 what = rm->name + 10;
912 }
59556548 913 else if (starts_with(rm->name, "refs/remotes/")) {
96890f4c
JH
914 kind = "remote-tracking branch";
915 what = rm->name + 13;
916 }
917 else {
918 kind = "";
919 what = rm->name;
920 }
b888d61c 921
96890f4c
JH
922 url_len = strlen(url);
923 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
924 ;
925 url_len = i + 1;
926 if (4 < i && !strncmp(".git", url + i - 3, 4))
927 url_len = i - 3;
928
929 strbuf_reset(&note);
930 if (*what) {
931 if (*kind)
932 strbuf_addf(&note, "%s ", kind);
933 strbuf_addf(&note, "'%s' of ", what);
934 }
900f2814
JK
935 switch (rm->fetch_head_status) {
936 case FETCH_HEAD_NOT_FOR_MERGE:
937 merge_status_marker = "not-for-merge";
938 /* fall-through */
939 case FETCH_HEAD_MERGE:
940 fprintf(fp, "%s\t%s\t%s",
f4e54d02 941 oid_to_hex(&rm->old_oid),
900f2814
JK
942 merge_status_marker,
943 note.buf);
944 for (i = 0; i < url_len; ++i)
945 if ('\n' == url[i])
946 fputs("\\n", fp);
947 else
948 fputc(url[i], fp);
949 fputc('\n', fp);
950 break;
951 default:
952 /* do not write anything to FETCH_HEAD */
953 break;
954 }
96890f4c
JH
955
956 strbuf_reset(&note);
957 if (ref) {
901f3d40
JH
958 rc |= update_local_ref(ref, what, rm, &note,
959 summary_width);
96890f4c
JH
960 free(ref);
961 } else
d0b39a03
NTND
962 format_display(&note, '*',
963 *kind ? kind : "branch", NULL,
964 *what ? what : "HEAD",
901f3d40 965 "FETCH_HEAD", summary_width);
96890f4c
JH
966 if (note.len) {
967 if (verbosity >= 0 && !shown_url) {
968 fprintf(stderr, _("From %.*s\n"),
969 url_len, url);
970 shown_url = 1;
971 }
972 if (verbosity >= 0)
973 fprintf(stderr, " %s\n", note.buf);
165f3902
NP
974 }
975 }
b888d61c 976 }
9516a598 977
fa250759 978 if (rc & STORE_REF_ERROR_DF_CONFLICT)
bd4a51fc 979 error(_("some local refs could not be updated; try running\n"
f3cb169b 980 " 'git remote prune %s' to remove any old, conflicting "
bd4a51fc 981 "branches"), remote_name);
9516a598
TRC
982
983 abort:
5914f2d0 984 strbuf_release(&note);
9516a598
TRC
985 free(url);
986 fclose(fp);
efb98b44 987 return rc;
b888d61c
DB
988}
989
4191c356
SP
990/*
991 * We would want to bypass the object transfer altogether if
d9eb0205 992 * everything we are going to fetch already exists and is connected
4191c356 993 * locally.
4191c356 994 */
35f9e3e5 995static int check_exist_and_connected(struct ref *ref_map)
4191c356 996{
f0e278b1 997 struct ref *rm = ref_map;
7043c707 998 struct check_connected_options opt = CHECK_CONNECTED_INIT;
35f9e3e5 999 struct ref *r;
f0e278b1 1000
4191c356
SP
1001 /*
1002 * If we are deepening a shallow clone we already have these
1003 * objects reachable. Running rev-list here will return with
1004 * a good (0) exit status and we'll bypass the fetch that we
1005 * really need to perform. Claiming failure now will ensure
1006 * we perform the network exchange to deepen our history.
1007 */
508ea882 1008 if (deepen)
4191c356 1009 return -1;
35f9e3e5
JT
1010
1011 /*
1012 * check_connected() allows objects to merely be promised, but
1013 * we need all direct targets to exist.
1014 */
1015 for (r = rm; r; r = r->next) {
1016 if (!has_object_file(&r->old_oid))
1017 return -1;
1018 }
1019
7043c707
JK
1020 opt.quiet = 1;
1021 return check_connected(iterate_ref_map, &rm, &opt);
4191c356
SP
1022}
1023
e2842b39 1024static int fetch_refs(struct transport *transport, struct ref *ref_map)
b888d61c 1025{
35f9e3e5 1026 int ret = check_exist_and_connected(ref_map);
4191c356 1027 if (ret)
e2842b39 1028 ret = transport_fetch_refs(transport, ref_map);
b888d61c 1029 if (!ret)
05c44226
BW
1030 /*
1031 * Keep the new pack's ".keep" file around to allow the caller
1032 * time to update refs to reference the new objects.
1033 */
1034 return 0;
1035 transport_unlock_pack(transport);
1036 return ret;
1037}
1038
1039/* Update local refs based on the ref values fetched from a remote */
1040static int consume_refs(struct transport *transport, struct ref *ref_map)
1041{
cf1e7c07
JT
1042 int connectivity_checked = transport->smart_options
1043 ? transport->smart_options->connectivity_checked : 0;
05c44226
BW
1044 int ret = store_updated_refs(transport->url,
1045 transport->remote->name,
cf1e7c07 1046 connectivity_checked,
05c44226 1047 ref_map);
1788c39c 1048 transport_unlock_pack(transport);
b888d61c
DB
1049 return ret;
1050}
1051
def11e71
BW
1052static int prune_refs(struct refspec *rs, struct ref *ref_map,
1053 const char *raw_url)
f360d844 1054{
4b3b33a7 1055 int url_len, i, result = 0;
a2ac50cb 1056 struct ref *ref, *stale_refs = get_stale_heads(rs, ref_map);
4b3b33a7 1057 char *url;
11fd66de 1058 int summary_width = transport_summary_width(stale_refs);
f360d844 1059 const char *dangling_msg = dry_run
18986d53
NTND
1060 ? _(" (%s will become dangling)")
1061 : _(" (%s has become dangling)");
f360d844 1062
4b3b33a7
TM
1063 if (raw_url)
1064 url = transport_anonymize_url(raw_url);
1065 else
1066 url = xstrdup("foreign");
1067
1068 url_len = strlen(url);
1069 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
1070 ;
1071
1072 url_len = i + 1;
1073 if (4 < i && !strncmp(".git", url + i - 3, 4))
1074 url_len = i - 3;
1075
a087b432
MH
1076 if (!dry_run) {
1077 struct string_list refnames = STRING_LIST_INIT_NODUP;
1078
1079 for (ref = stale_refs; ref; ref = ref->next)
1080 string_list_append(&refnames, ref->name);
1081
64da4199 1082 result = delete_refs("fetch: prune", &refnames, 0);
a087b432
MH
1083 string_list_clear(&refnames, 0);
1084 }
1085
1086 if (verbosity >= 0) {
1087 for (ref = stale_refs; ref; ref = ref->next) {
d0b39a03 1088 struct strbuf sb = STRBUF_INIT;
a087b432
MH
1089 if (!shown_url) {
1090 fprintf(stderr, _("From %.*s\n"), url_len, url);
1091 shown_url = 1;
1092 }
2cb040ba 1093 format_display(&sb, '-', _("[deleted]"), NULL,
901f3d40
JH
1094 _("(none)"), prettify_refname(ref->name),
1095 summary_width);
d0b39a03
NTND
1096 fprintf(stderr, " %s\n",sb.buf);
1097 strbuf_release(&sb);
f360d844
JS
1098 warn_dangling_symref(stderr, dangling_msg, ref->name);
1099 }
1100 }
a087b432 1101
4b3b33a7 1102 free(url);
f360d844
JS
1103 free_refs(stale_refs);
1104 return result;
1105}
1106
8ee5d731
JS
1107static void check_not_current_branch(struct ref *ref_map)
1108{
1109 struct branch *current_branch = branch_get(NULL);
1110
1111 if (is_bare_repository() || !current_branch)
1112 return;
1113
1114 for (; ref_map; ref_map = ref_map->next)
1115 if (ref_map->peer_ref && !strcmp(current_branch->refname,
1116 ref_map->peer_ref->name))
bd4a51fc
ÆAB
1117 die(_("Refusing to fetch into current branch %s "
1118 "of non-bare repository"), current_branch->refname);
8ee5d731
JS
1119}
1120
e6cc5104
JH
1121static int truncate_fetch_head(void)
1122{
102de880 1123 const char *filename = git_path_fetch_head(the_repository);
ea56518d 1124 FILE *fp = fopen_for_writing(filename);
e6cc5104
JH
1125
1126 if (!fp)
6da31d7f 1127 return error_errno(_("cannot open %s"), filename);
e6cc5104
JH
1128 fclose(fp);
1129 return 0;
1130}
1131
db5723c6
JH
1132static void set_option(struct transport *transport, const char *name, const char *value)
1133{
1134 int r = transport_set_option(transport, name, value);
1135 if (r < 0)
1136 die(_("Option \"%s\" value \"%s\" is not valid for %s"),
1137 name, value, transport->url);
1138 if (r > 0)
1139 warning(_("Option \"%s\" is ignored for %s\n"),
1140 name, transport->url);
1141}
1142
3390e42a
JT
1143
1144static int add_oid(const char *refname, const struct object_id *oid, int flags,
1145 void *cb_data)
1146{
1147 struct oid_array *oids = cb_data;
1148
1149 oid_array_append(oids, oid);
1150 return 0;
1151}
1152
1153static void add_negotiation_tips(struct git_transport_options *smart_options)
1154{
1155 struct oid_array *oids = xcalloc(1, sizeof(*oids));
1156 int i;
1157
1158 for (i = 0; i < negotiation_tip.nr; i++) {
1159 const char *s = negotiation_tip.items[i].string;
1160 int old_nr;
1161 if (!has_glob_specials(s)) {
1162 struct object_id oid;
1163 if (get_oid(s, &oid))
1164 die("%s is not a valid object", s);
1165 oid_array_append(oids, &oid);
1166 continue;
1167 }
1168 old_nr = oids->nr;
1169 for_each_glob_ref(add_oid, s, oids);
1170 if (old_nr == oids->nr)
1171 warning("Ignoring --negotiation-tip=%s because it does not match any refs",
1172 s);
1173 }
1174 smart_options->negotiation_tips = oids;
1175}
1176
508ea882 1177static struct transport *prepare_transport(struct remote *remote, int deepen)
db5723c6
JH
1178{
1179 struct transport *transport;
87c2d9d3 1180
db5723c6
JH
1181 transport = transport_get(remote, NULL);
1182 transport_set_verbosity(transport, verbosity, progress);
c915f11e 1183 transport->family = family;
db5723c6
JH
1184 if (upload_pack)
1185 set_option(transport, TRANS_OPT_UPLOADPACK, upload_pack);
1186 if (keep)
1187 set_option(transport, TRANS_OPT_KEEP, "yes");
1188 if (depth)
1189 set_option(transport, TRANS_OPT_DEPTH, depth);
508ea882
NTND
1190 if (deepen && deepen_since)
1191 set_option(transport, TRANS_OPT_DEEPEN_SINCE, deepen_since);
a45a2600
NTND
1192 if (deepen && deepen_not.nr)
1193 set_option(transport, TRANS_OPT_DEEPEN_NOT,
1194 (const char *)&deepen_not);
cccf74e2
NTND
1195 if (deepen_relative)
1196 set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, "yes");
48d25cae
NTND
1197 if (update_shallow)
1198 set_option(transport, TRANS_OPT_UPDATE_SHALLOW, "yes");
acb0c572 1199 if (filter_options.choice) {
87c2d9d3
JS
1200 struct strbuf expanded_filter_spec = STRBUF_INIT;
1201 expand_list_objects_filter_spec(&filter_options,
1202 &expanded_filter_spec);
acb0c572 1203 set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER,
87c2d9d3 1204 expanded_filter_spec.buf);
acb0c572 1205 set_option(transport, TRANS_OPT_FROM_PROMISOR, "1");
87c2d9d3 1206 strbuf_release(&expanded_filter_spec);
acb0c572 1207 }
3390e42a
JT
1208 if (negotiation_tip.nr) {
1209 if (transport->smart_options)
1210 add_negotiation_tips(transport->smart_options);
1211 else
1212 warning("Ignoring --negotiation-tip because the protocol does not support it.");
1213 }
db5723c6
JH
1214 return transport;
1215}
1216
069d5032
JH
1217static void backfill_tags(struct transport *transport, struct ref *ref_map)
1218{
508ea882
NTND
1219 int cannot_reuse;
1220
1221 /*
1222 * Once we have set TRANS_OPT_DEEPEN_SINCE, we can't unset it
1223 * when remote helper is used (setting it to an empty string
1224 * is not unsetting). We could extend the remote helper
1225 * protocol for that, but for now, just force a new connection
a45a2600 1226 * without deepen-since. Similar story for deepen-not.
508ea882 1227 */
a45a2600
NTND
1228 cannot_reuse = transport->cannot_reuse ||
1229 deepen_since || deepen_not.nr;
508ea882
NTND
1230 if (cannot_reuse) {
1231 gsecondary = prepare_transport(transport->remote, 0);
b26ed430
JH
1232 transport = gsecondary;
1233 }
1234
069d5032
JH
1235 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
1236 transport_set_option(transport, TRANS_OPT_DEPTH, "0");
cccf74e2 1237 transport_set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, NULL);
e2842b39 1238 if (!fetch_refs(transport, ref_map))
05c44226 1239 consume_refs(transport, ref_map);
b26ed430
JH
1240
1241 if (gsecondary) {
1242 transport_disconnect(gsecondary);
1243 gsecondary = NULL;
1244 }
069d5032
JH
1245}
1246
b888d61c 1247static int do_fetch(struct transport *transport,
65a1301f 1248 struct refspec *rs)
b888d61c 1249{
7f98428d 1250 struct ref *ref_map;
b888d61c 1251 int autotags = (transport->remote->fetch_tags == 1);
5b87d8d3 1252 int retcode = 0;
6d1700d5
BW
1253 const struct ref *remote_refs;
1254 struct argv_array ref_prefixes = ARGV_ARRAY_INIT;
e70a3030 1255 int must_list_refs = 1;
b1a01e1c 1256
ed368546
DJ
1257 if (tags == TAGS_DEFAULT) {
1258 if (transport->remote->fetch_tags == 2)
1259 tags = TAGS_SET;
1260 if (transport->remote->fetch_tags == -1)
1261 tags = TAGS_UNSET;
1262 }
b888d61c 1263
b888d61c 1264 /* if not appending, truncate FETCH_HEAD */
28a15401 1265 if (!append && !dry_run) {
5b87d8d3
MH
1266 retcode = truncate_fetch_head();
1267 if (retcode)
1268 goto cleanup;
d6617c7c 1269 }
b888d61c 1270
e70a3030
JT
1271 if (rs->nr) {
1272 int i;
1273
6d1700d5 1274 refspec_ref_prefixes(rs, &ref_prefixes);
e70a3030
JT
1275
1276 /*
1277 * We can avoid listing refs if all of them are exact
1278 * OIDs
1279 */
1280 must_list_refs = 0;
1281 for (i = 0; i < rs->nr; i++) {
1282 if (!rs->items[i].exact_sha1) {
1283 must_list_refs = 1;
1284 break;
1285 }
1286 }
1287 } else if (transport->remote && transport->remote->fetch.nr)
6d1700d5 1288 refspec_ref_prefixes(&transport->remote->fetch, &ref_prefixes);
b888d61c 1289
e70a3030
JT
1290 if (tags == TAGS_SET || tags == TAGS_DEFAULT) {
1291 must_list_refs = 1;
1292 if (ref_prefixes.argc)
1293 argv_array_push(&ref_prefixes, "refs/tags/");
b888d61c
DB
1294 }
1295
e70a3030
JT
1296 if (must_list_refs)
1297 remote_refs = transport_get_remote_refs(transport, &ref_prefixes);
1298 else
1299 remote_refs = NULL;
1300
6d1700d5
BW
1301 argv_array_clear(&ref_prefixes);
1302
1303 ref_map = get_ref_map(transport->remote, remote_refs, rs,
1304 tags, &autotags);
8ee5d731
JS
1305 if (!update_head_ok)
1306 check_not_current_branch(ref_map);
b888d61c 1307
41fa7d2e
SP
1308 if (tags == TAGS_DEFAULT && autotags)
1309 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
ed43de6e 1310 if (prune) {
0838bf47
MH
1311 /*
1312 * We only prune based on refspecs specified
1313 * explicitly (via command line or configuration); we
1314 * don't care whether --tags was specified.
1315 */
65a1301f 1316 if (rs->nr) {
def11e71 1317 prune_refs(rs, ref_map, transport->url);
e8c1e6c7 1318 } else {
def11e71 1319 prune_refs(&transport->remote->fetch,
4b3b33a7
TM
1320 ref_map,
1321 transport->url);
e8c1e6c7 1322 }
ed43de6e 1323 }
e2842b39 1324 if (fetch_refs(transport, ref_map) || consume_refs(transport, ref_map)) {
10a6cc88
TM
1325 free_refs(ref_map);
1326 retcode = 1;
1327 goto cleanup;
1328 }
7f98428d 1329 free_refs(ref_map);
b888d61c
DB
1330
1331 /* if neither --no-tags nor --tags was specified, do automated tag
1332 * following ... */
83201998 1333 if (tags == TAGS_DEFAULT && autotags) {
c50b2b47
SP
1334 struct ref **tail = &ref_map;
1335 ref_map = NULL;
6d1700d5 1336 find_non_local_tags(remote_refs, &ref_map, &tail);
069d5032
JH
1337 if (ref_map)
1338 backfill_tags(transport, ref_map);
b888d61c
DB
1339 free_refs(ref_map);
1340 }
1341
5b87d8d3 1342 cleanup:
5b87d8d3 1343 return retcode;
b888d61c
DB
1344}
1345
9c4a036b
BG
1346static int get_one_remote_for_fetch(struct remote *remote, void *priv)
1347{
1348 struct string_list *list = priv;
7cc91a2f 1349 if (!remote->skip_default_update)
1d2f80fa 1350 string_list_append(list, remote->name);
9c4a036b
BG
1351 return 0;
1352}
1353
1354struct remote_group_data {
1355 const char *name;
1356 struct string_list *list;
1357};
1358
1359static int get_remote_group(const char *key, const char *value, void *priv)
1360{
1361 struct remote_group_data *g = priv;
1362
bc598c32 1363 if (skip_prefix(key, "remotes.", &key) && !strcmp(key, g->name)) {
9c4a036b 1364 /* split list by white space */
9c4a036b 1365 while (*value) {
5f65499f
MH
1366 size_t wordlen = strcspn(value, " \t\n");
1367
e286542d 1368 if (wordlen >= 1)
b7410f61 1369 string_list_append_nodup(g->list,
e286542d
MH
1370 xstrndup(value, wordlen));
1371 value += wordlen + (value[wordlen] != '\0');
9c4a036b
BG
1372 }
1373 }
1374
1375 return 0;
1376}
1377
1378static int add_remote_or_group(const char *name, struct string_list *list)
1379{
1380 int prev_nr = list->nr;
66dbfd55
GV
1381 struct remote_group_data g;
1382 g.name = name; g.list = list;
9c4a036b
BG
1383
1384 git_config(get_remote_group, &g);
1385 if (list->nr == prev_nr) {
674468b3 1386 struct remote *remote = remote_get(name);
e459b073 1387 if (!remote_is_configured(remote, 0))
9c4a036b 1388 return 0;
1d2f80fa 1389 string_list_append(list, remote->name);
9c4a036b
BG
1390 }
1391 return 1;
1392}
1393
85556d4e 1394static void add_options_to_argv(struct argv_array *argv)
9c4a036b 1395{
28a15401 1396 if (dry_run)
85556d4e 1397 argv_array_push(argv, "--dry-run");
90765fa3
MH
1398 if (prune != -1)
1399 argv_array_push(argv, prune ? "--prune" : "--no-prune");
97716d21
ÆAB
1400 if (prune_tags != -1)
1401 argv_array_push(argv, prune_tags ? "--prune-tags" : "--no-prune-tags");
bba5322a 1402 if (update_head_ok)
85556d4e 1403 argv_array_push(argv, "--update-head-ok");
bba5322a 1404 if (force)
85556d4e 1405 argv_array_push(argv, "--force");
bba5322a 1406 if (keep)
85556d4e 1407 argv_array_push(argv, "--keep");
be254a0e 1408 if (recurse_submodules == RECURSE_SUBMODULES_ON)
85556d4e 1409 argv_array_push(argv, "--recurse-submodules");
8f0700dd 1410 else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND)
85556d4e 1411 argv_array_push(argv, "--recurse-submodules=on-demand");
85566460
DJ
1412 if (tags == TAGS_SET)
1413 argv_array_push(argv, "--tags");
1414 else if (tags == TAGS_UNSET)
1415 argv_array_push(argv, "--no-tags");
9c4a036b 1416 if (verbosity >= 2)
85556d4e 1417 argv_array_push(argv, "-v");
9c4a036b 1418 if (verbosity >= 1)
85556d4e 1419 argv_array_push(argv, "-v");
9c4a036b 1420 else if (verbosity < 0)
85556d4e 1421 argv_array_push(argv, "-q");
7dce19d3
JL
1422
1423}
1424
1425static int fetch_multiple(struct string_list *list)
1426{
1427 int i, result = 0;
85556d4e 1428 struct argv_array argv = ARGV_ARRAY_INIT;
9c4a036b 1429
e6cc5104
JH
1430 if (!append && !dry_run) {
1431 int errcode = truncate_fetch_head();
1432 if (errcode)
1433 return errcode;
1434 }
1435
85556d4e
JK
1436 argv_array_pushl(&argv, "fetch", "--append", NULL);
1437 add_options_to_argv(&argv);
1438
9c4a036b
BG
1439 for (i = 0; i < list->nr; i++) {
1440 const char *name = list->items[i].string;
85556d4e 1441 argv_array_push(&argv, name);
9c4a036b 1442 if (verbosity >= 0)
bd4a51fc 1443 printf(_("Fetching %s\n"), name);
85556d4e 1444 if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
bd4a51fc 1445 error(_("Could not fetch %s"), name);
9c4a036b
BG
1446 result = 1;
1447 }
85556d4e 1448 argv_array_pop(&argv);
9c4a036b
BG
1449 }
1450
85556d4e 1451 argv_array_clear(&argv);
9c4a036b
BG
1452 return result;
1453}
1454
aa57b871
JH
1455/*
1456 * Fetching from the promisor remote should use the given filter-spec
1457 * or inherit the default filter-spec from the config.
1458 */
1459static inline void fetch_one_setup_partial(struct remote *remote)
1460{
1461 /*
1462 * Explicit --no-filter argument overrides everything, regardless
1463 * of any prior partial clones and fetches.
1464 */
1465 if (filter_options.no_filter)
1466 return;
1467
1468 /*
1469 * If no prior partial clone/fetch and the current fetch DID NOT
1470 * request a partial-fetch, do a normal fetch.
1471 */
1472 if (!repository_format_partial_clone && !filter_options.choice)
1473 return;
1474
1475 /*
1476 * If this is the FIRST partial-fetch request, we enable partial
1477 * on this repo and remember the given filter-spec as the default
1478 * for subsequent fetches to this remote.
1479 */
1480 if (!repository_format_partial_clone && filter_options.choice) {
1481 partial_clone_register(remote->name, &filter_options);
1482 return;
1483 }
1484
1485 /*
1486 * We are currently limited to only ONE promisor remote and only
1487 * allow partial-fetches from the promisor remote.
1488 */
1489 if (strcmp(remote->name, repository_format_partial_clone)) {
1490 if (filter_options.choice)
e0137875 1491 die(_("--filter can only be used with the remote "
32ceace3 1492 "configured in extensions.partialClone"));
aa57b871
JH
1493 return;
1494 }
1495
1496 /*
1497 * Do a partial-fetch from the promisor remote using either the
1498 * explicitly given filter-spec or inherit the filter-spec from
1499 * the config.
1500 */
1501 if (!filter_options.choice)
1502 partial_clone_get_default_filter_spec(&filter_options);
1503 return;
1504}
1505
97716d21 1506static int fetch_one(struct remote *remote, int argc, const char **argv, int prune_tags_ok)
b888d61c 1507{
d7c8e307
BW
1508 struct refspec rs = REFSPEC_INIT_FETCH;
1509 int i;
7b7f39ea 1510 int exit_code;
6317972c
ÆAB
1511 int maybe_prune_tags;
1512 int remote_via_config = remote_is_configured(remote, 0);
b888d61c 1513
fa685bdf 1514 if (!remote)
bd4a51fc
ÆAB
1515 die(_("No remote repository specified. Please, specify either a URL or a\n"
1516 "remote name from which new revisions should be fetched."));
fa685bdf 1517
508ea882 1518 gtransport = prepare_transport(remote, 1);
737c5a9c
MS
1519
1520 if (prune < 0) {
1521 /* no command line request */
07118832
ÆAB
1522 if (0 <= remote->prune)
1523 prune = remote->prune;
737c5a9c
MS
1524 else if (0 <= fetch_prune_config)
1525 prune = fetch_prune_config;
1526 else
1527 prune = PRUNE_BY_DEFAULT;
1528 }
1529
97716d21
ÆAB
1530 if (prune_tags < 0) {
1531 /* no command line request */
1532 if (0 <= remote->prune_tags)
1533 prune_tags = remote->prune_tags;
1534 else if (0 <= fetch_prune_tags_config)
1535 prune_tags = fetch_prune_tags_config;
1536 else
1537 prune_tags = PRUNE_TAGS_BY_DEFAULT;
1538 }
1539
6317972c
ÆAB
1540 maybe_prune_tags = prune_tags_ok && prune_tags;
1541 if (maybe_prune_tags && remote_via_config)
95303500 1542 refspec_append(&remote->fetch, TAG_REFSPEC);
97716d21 1543
d7c8e307
BW
1544 if (maybe_prune_tags && (argc || !remote_via_config))
1545 refspec_append(&rs, TAG_REFSPEC);
6317972c 1546
d7c8e307
BW
1547 for (i = 0; i < argc; i++) {
1548 if (!strcmp(argv[i], "tag")) {
1549 char *tag;
1550 i++;
1551 if (i >= argc)
1552 die(_("You need to specify a tag name."));
1553
1554 tag = xstrfmt("refs/tags/%s:refs/tags/%s",
1555 argv[i], argv[i]);
1556 refspec_append(&rs, tag);
1557 free(tag);
1558 } else {
1559 refspec_append(&rs, argv[i]);
b888d61c 1560 }
b888d61c
DB
1561 }
1562
5e3548ef
BW
1563 if (server_options.nr)
1564 gtransport->server_options = &server_options;
1565
57b235a4 1566 sigchain_push_common(unlock_pack_on_signal);
e4022ed2 1567 atexit(unlock_pack);
14358894 1568 sigchain_push(SIGPIPE, SIG_IGN);
65a1301f 1569 exit_code = do_fetch(gtransport, &rs);
14358894 1570 sigchain_pop(SIGPIPE);
d7c8e307 1571 refspec_clear(&rs);
af234459
JH
1572 transport_disconnect(gtransport);
1573 gtransport = NULL;
7b7f39ea 1574 return exit_code;
b888d61c 1575}
9c4a036b
BG
1576
1577int cmd_fetch(int argc, const char **argv, const char *prefix)
1578{
1579 int i;
b7410f61 1580 struct string_list list = STRING_LIST_INIT_DUP;
a1743343 1581 struct remote *remote = NULL;
9c4a036b 1582 int result = 0;
c1a7902f 1583 int prune_tags_ok = 1;
1991006c 1584 struct argv_array argv_gc_auto = ARGV_ARRAY_INIT;
9c4a036b 1585
bbc30f99
JK
1586 packet_trace_identity("fetch");
1587
acb0c572
JH
1588 fetch_if_missing = 0;
1589
9c4a036b
BG
1590 /* Record the command line for the reflog */
1591 strbuf_addstr(&default_rla, "fetch");
1592 for (i = 1; i < argc; i++)
1593 strbuf_addf(&default_rla, " %s", argv[i]);
1594
71a6953d 1595 fetch_config_from_gitmodules(&max_children, &recurse_submodules);
737c5a9c
MS
1596 git_config(git_fetch_config, NULL);
1597
9c4a036b
BG
1598 argc = parse_options(argc, argv, prefix,
1599 builtin_fetch_options, builtin_fetch_usage, 0);
1600
cccf74e2
NTND
1601 if (deepen_relative) {
1602 if (deepen_relative < 0)
1603 die(_("Negative depth in --deepen is not supported"));
1604 if (depth)
1605 die(_("--deepen and --depth are mutually exclusive"));
1606 depth = xstrfmt("%d", deepen_relative);
1607 }
4dcb167f
NTND
1608 if (unshallow) {
1609 if (depth)
1610 die(_("--depth and --unshallow cannot be used together"));
c8813487 1611 else if (!is_repository_shallow(the_repository))
4dcb167f 1612 die(_("--unshallow on a complete repository does not make sense"));
2805bb59
JK
1613 else
1614 depth = xstrfmt("%d", INFINITE_DEPTH);
4dcb167f
NTND
1615 }
1616
5594bcad
NTND
1617 /* no need to be strict, transport_set_option() will validate it again */
1618 if (depth && atoi(depth) < 1)
1619 die(_("depth %s is not a positive number"), depth);
a45a2600 1620 if (depth || deepen_since || deepen_not.nr)
508ea882 1621 deepen = 1;
5594bcad 1622
acb0c572
JH
1623 if (filter_options.choice && !repository_format_partial_clone)
1624 die("--filter can only be used when extensions.partialClone is set");
1625
9c4a036b
BG
1626 if (all) {
1627 if (argc == 1)
bd4a51fc 1628 die(_("fetch --all does not take a repository argument"));
9c4a036b 1629 else if (argc > 1)
bd4a51fc 1630 die(_("fetch --all does not make sense with refspecs"));
9c4a036b 1631 (void) for_each_remote(get_one_remote_for_fetch, &list);
9c4a036b
BG
1632 } else if (argc == 0) {
1633 /* No arguments -- use default remote */
1634 remote = remote_get(NULL);
16679e37
BG
1635 } else if (multiple) {
1636 /* All arguments are assumed to be remotes or groups */
1637 for (i = 0; i < argc; i++)
1638 if (!add_remote_or_group(argv[i], &list))
bd4a51fc 1639 die(_("No such remote or remote group: %s"), argv[i]);
9c4a036b
BG
1640 } else {
1641 /* Single remote or group */
1642 (void) add_remote_or_group(argv[0], &list);
1643 if (list.nr > 1) {
1644 /* More than one remote */
1645 if (argc > 1)
bd4a51fc 1646 die(_("Fetching a group and specifying refspecs does not make sense"));
9c4a036b
BG
1647 } else {
1648 /* Zero or one remotes */
1649 remote = remote_get(argv[0]);
c1a7902f 1650 prune_tags_ok = (argc == 1);
a1743343
JT
1651 argc--;
1652 argv++;
9c4a036b
BG
1653 }
1654 }
1655
acb0c572 1656 if (remote) {
aa57b871
JH
1657 if (filter_options.choice || repository_format_partial_clone)
1658 fetch_one_setup_partial(remote);
c1a7902f 1659 result = fetch_one(remote, argc, argv, prune_tags_ok);
acb0c572
JH
1660 } else {
1661 if (filter_options.choice)
e0137875
CC
1662 die(_("--filter can only be used with the remote "
1663 "configured in extensions.partialclone"));
aa57b871 1664 /* TODO should this also die if we have a previous partial-clone? */
a1743343 1665 result = fetch_multiple(&list);
acb0c572 1666 }
a1743343 1667
be254a0e 1668 if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
85556d4e
JK
1669 struct argv_array options = ARGV_ARRAY_INIT;
1670
1671 add_options_to_argv(&options);
e724197f
BW
1672 result = fetch_populated_submodules(the_repository,
1673 &options,
7dce19d3 1674 submodule_prefix,
8f0700dd 1675 recurse_submodules,
8fa29159 1676 recurse_submodules_default,
62104ba1
SB
1677 verbosity < 0,
1678 max_children);
85556d4e 1679 argv_array_clear(&options);
7dce19d3
JL
1680 }
1681
9c4a036b
BG
1682 string_list_clear(&list, 0);
1683
d0b59866 1684 close_all_packs(the_repository->objects);
0898c962 1685
1991006c 1686 argv_array_pushl(&argv_gc_auto, "gc", "--auto", NULL);
6fceed3b
NTND
1687 if (verbosity < 0)
1688 argv_array_push(&argv_gc_auto, "--quiet");
1991006c
NTND
1689 run_command_v_opt(argv_gc_auto.argv, RUN_GIT_CMD);
1690 argv_array_clear(&argv_gc_auto);
131b8fcb 1691
9c4a036b
BG
1692 return result;
1693}