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