]> git.ipfire.org Git - thirdparty/git.git/blame - builtin/fetch.c
fetch-pack: write shallow, then check connectivity
[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
6d1700d5
BW
257static void find_non_local_tags(const struct ref *refs,
258 struct ref **head,
259 struct ref ***tail)
a0fbb5a3
MH
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);
6d1700d5 267 for (ref = refs; 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
6d1700d5
BW
341static struct ref *get_ref_map(struct remote *remote,
342 const struct ref *remote_refs,
65d96c8b 343 struct refspec *rs,
f137a45e 344 int tags, int *autotags)
b888d61c
DB
345{
346 int i;
347 struct ref *rm;
348 struct ref *ref_map = NULL;
349 struct ref **tail = &ref_map;
350
c5a84e92
MH
351 /* opportunistically-updated references: */
352 struct ref *orefs = NULL, **oref_tail = &orefs;
b888d61c 353
14b8ced3 354 struct string_list existing_refs = STRING_LIST_INIT_DUP;
f2690487 355
65d96c8b 356 if (rs->nr) {
c5558f80 357 struct refspec *fetch_refspec;
c5558f80 358
65d96c8b
BW
359 for (i = 0; i < rs->nr; i++) {
360 get_fetch_map(remote_refs, &rs->items[i], &tail, 0);
361 if (rs->items[i].dst && rs->items[i].dst[0])
b888d61c
DB
362 *autotags = 1;
363 }
0281c930 364 /* Merge everything on the command line (but not --tags) */
b888d61c 365 for (rm = ref_map; rm; rm = rm->next)
900f2814 366 rm->fetch_head_status = FETCH_HEAD_MERGE;
f2690487
JK
367
368 /*
0281c930
MH
369 * For any refs that we happen to be fetching via
370 * command-line arguments, the destination ref might
371 * have been missing or have been different than the
372 * remote-tracking ref that would be derived from the
373 * configured refspec. In these cases, we want to
374 * take the opportunity to update their configured
375 * remote-tracking reference. However, we do not want
376 * to mention these entries in FETCH_HEAD at all, as
377 * they would simply be duplicates of existing
378 * entries, so we set them FETCH_HEAD_IGNORE below.
379 *
380 * We compute these entries now, based only on the
381 * refspecs specified on the command line. But we add
382 * them to the list following the refspecs resulting
383 * from the tags option so that one of the latter,
384 * which has FETCH_HEAD_NOT_FOR_MERGE, is not removed
385 * by ref_remove_duplicates() in favor of one of these
386 * opportunistic entries with FETCH_HEAD_IGNORE.
f2690487 387 */
65d96c8b
BW
388 if (refmap.nr)
389 fetch_refspec = &refmap;
390 else
6d1700d5 391 fetch_refspec = &remote->fetch;
c5558f80 392
65d96c8b
BW
393 for (i = 0; i < fetch_refspec->nr; i++)
394 get_fetch_map(ref_map, &fetch_refspec->items[i], &oref_tail, 1);
e4cffacc 395 } else if (refmap.nr) {
c5558f80 396 die("--refmap option is only meaningful with command-line refspec(s).");
b888d61c
DB
397 } else {
398 /* Use the defaults */
85682c19
SP
399 struct branch *branch = branch_get(NULL);
400 int has_merge = branch_has_merge_config(branch);
3ee1757b 401 if (remote &&
e5349abf 402 (remote->fetch.nr ||
f31dbdc7 403 /* Note: has_merge implies non-NULL branch->remote_name */
3ee1757b 404 (has_merge && !strcmp(branch->remote_name, remote->name)))) {
e5349abf
BW
405 for (i = 0; i < remote->fetch.nr; i++) {
406 get_fetch_map(remote_refs, &remote->fetch.items[i], &tail, 0);
407 if (remote->fetch.items[i].dst &&
408 remote->fetch.items[i].dst[0])
b888d61c 409 *autotags = 1;
85682c19 410 if (!i && !has_merge && ref_map &&
e5349abf 411 !remote->fetch.items[0].pattern)
900f2814 412 ref_map->fetch_head_status = FETCH_HEAD_MERGE;
b888d61c 413 }
da0204df
JS
414 /*
415 * if the remote we're fetching from is the same
416 * as given in branch.<name>.remote, we add the
417 * ref given in branch.<name>.merge, too.
f31dbdc7
BC
418 *
419 * Note: has_merge implies non-NULL branch->remote_name
da0204df 420 */
9ad7c5ae
JH
421 if (has_merge &&
422 !strcmp(branch->remote_name, remote->name))
85682c19 423 add_merge_config(&ref_map, remote_refs, branch, &tail);
b888d61c
DB
424 } else {
425 ref_map = get_remote_ref(remote_refs, "HEAD");
9ad7c5ae 426 if (!ref_map)
bd4a51fc 427 die(_("Couldn't find remote ref HEAD"));
900f2814 428 ref_map->fetch_head_status = FETCH_HEAD_MERGE;
5aaf7f2a 429 tail = &ref_map->next;
b888d61c
DB
430 }
431 }
0281c930 432
c5a84e92
MH
433 if (tags == TAGS_SET)
434 /* also fetch all tags */
435 get_fetch_map(remote_refs, tag_refspec, &tail, 0);
436 else if (tags == TAGS_DEFAULT && *autotags)
6d1700d5 437 find_non_local_tags(remote_refs, &ref_map, &tail);
0281c930 438
c5a84e92
MH
439 /* Now append any refs to be updated opportunistically: */
440 *tail = orefs;
441 for (rm = orefs; rm; rm = rm->next) {
442 rm->fetch_head_status = FETCH_HEAD_IGNORE;
443 tail = &rm->next;
444 }
445
14b8ced3
BW
446 ref_map = ref_remove_duplicates(ref_map);
447
448 for_each_ref(add_existing, &existing_refs);
449 for (rm = ref_map; rm; rm = rm->next) {
450 if (rm->peer_ref) {
451 struct string_list_item *peer_item =
452 string_list_lookup(&existing_refs,
453 rm->peer_ref->name);
454 if (peer_item) {
455 struct object_id *old_oid = peer_item->util;
456 oidcpy(&rm->peer_ref->old_oid, old_oid);
457 }
458 }
459 }
460 string_list_clear(&existing_refs, 1);
461
462 return ref_map;
b888d61c
DB
463}
464
fa250759
JK
465#define STORE_REF_ERROR_OTHER 1
466#define STORE_REF_ERROR_DF_CONFLICT 2
467
b888d61c
DB
468static int s_update_ref(const char *action,
469 struct ref *ref,
470 int check_old)
471{
1412f762 472 char *msg;
b888d61c 473 char *rla = getenv("GIT_REFLOG_ACTION");
cd94f765
RS
474 struct ref_transaction *transaction;
475 struct strbuf err = STRBUF_INIT;
476 int ret, df_conflict = 0;
b888d61c 477
28a15401
JS
478 if (dry_run)
479 return 0;
b888d61c 480 if (!rla)
2d324efa 481 rla = default_rla.buf;
1412f762 482 msg = xstrfmt("%s: %s", rla, action);
cd94f765
RS
483
484 transaction = ref_transaction_begin(&err);
485 if (!transaction ||
1d147bdf 486 ref_transaction_update(transaction, ref->name,
89f3bbdd 487 &ref->new_oid,
488 check_old ? &ref->old_oid : NULL,
1d147bdf 489 0, msg, &err))
cd94f765
RS
490 goto fail;
491
492 ret = ref_transaction_commit(transaction, &err);
493 if (ret) {
494 df_conflict = (ret == TRANSACTION_NAME_CONFLICT);
495 goto fail;
496 }
497
498 ref_transaction_free(transaction);
499 strbuf_release(&err);
1412f762 500 free(msg);
b888d61c 501 return 0;
cd94f765
RS
502fail:
503 ref_transaction_free(transaction);
504 error("%s", err.buf);
505 strbuf_release(&err);
1412f762 506 free(msg);
cd94f765
RS
507 return df_conflict ? STORE_REF_ERROR_DF_CONFLICT
508 : STORE_REF_ERROR_OTHER;
b888d61c
DB
509}
510
6bc91f23 511static int refcol_width = 10;
bc437d10 512static int compact_format;
6bc91f23
NTND
513
514static void adjust_refcol_width(const struct ref *ref)
515{
516 int max, rlen, llen, len;
517
518 /* uptodate lines are only shown on high verbosity level */
519 if (!verbosity && !oidcmp(&ref->peer_ref->old_oid, &ref->old_oid))
520 return;
521
522 max = term_columns();
523 rlen = utf8_strwidth(prettify_refname(ref->name));
bc437d10 524
6bc91f23
NTND
525 llen = utf8_strwidth(prettify_refname(ref->peer_ref->name));
526
527 /*
528 * rough estimation to see if the output line is too long and
529 * should not be counted (we can't do precise calculation
530 * anyway because we don't know if the error explanation part
531 * will be printed in update_local_ref)
532 */
bc437d10
NTND
533 if (compact_format) {
534 llen = 0;
535 max = max * 2 / 3;
536 }
6bc91f23
NTND
537 len = 21 /* flag and summary */ + rlen + 4 /* -> */ + llen;
538 if (len >= max)
539 return;
540
bc437d10
NTND
541 /*
542 * Not precise calculation for compact mode because '*' can
543 * appear on the left hand side of '->' and shrink the column
544 * back.
545 */
6bc91f23
NTND
546 if (refcol_width < rlen)
547 refcol_width = rlen;
548}
549
550static void prepare_format_display(struct ref *ref_map)
551{
552 struct ref *rm;
bc437d10
NTND
553 const char *format = "full";
554
555 git_config_get_string_const("fetch.output", &format);
556 if (!strcasecmp(format, "full"))
557 compact_format = 0;
558 else if (!strcasecmp(format, "compact"))
559 compact_format = 1;
560 else
561 die(_("configuration fetch.output contains invalid value %s"),
562 format);
6bc91f23
NTND
563
564 for (rm = ref_map; rm; rm = rm->next) {
565 if (rm->status == REF_STATUS_REJECT_SHALLOW ||
566 !rm->peer_ref ||
567 !strcmp(rm->name, "HEAD"))
568 continue;
569
570 adjust_refcol_width(rm);
571 }
572}
165f3902 573
bc437d10
NTND
574static void print_remote_to_local(struct strbuf *display,
575 const char *remote, const char *local)
576{
577 strbuf_addf(display, "%-*s -> %s", refcol_width, remote, local);
578}
579
580static int find_and_replace(struct strbuf *haystack,
581 const char *needle,
582 const char *placeholder)
583{
584 const char *p = strstr(haystack->buf, needle);
585 int plen, nlen;
586
587 if (!p)
588 return 0;
589
590 if (p > haystack->buf && p[-1] != '/')
591 return 0;
592
593 plen = strlen(p);
594 nlen = strlen(needle);
595 if (plen > nlen && p[nlen] != '/')
596 return 0;
597
598 strbuf_splice(haystack, p - haystack->buf, nlen,
599 placeholder, strlen(placeholder));
600 return 1;
601}
602
603static void print_compact(struct strbuf *display,
604 const char *remote, const char *local)
605{
606 struct strbuf r = STRBUF_INIT;
607 struct strbuf l = STRBUF_INIT;
608
609 if (!strcmp(remote, local)) {
610 strbuf_addf(display, "%-*s -> *", refcol_width, remote);
611 return;
612 }
613
614 strbuf_addstr(&r, remote);
615 strbuf_addstr(&l, local);
616
617 if (!find_and_replace(&r, local, "*"))
618 find_and_replace(&l, remote, "*");
619 print_remote_to_local(display, r.buf, l.buf);
620
621 strbuf_release(&r);
622 strbuf_release(&l);
623}
624
d0b39a03
NTND
625static void format_display(struct strbuf *display, char code,
626 const char *summary, const char *error,
901f3d40
JH
627 const char *remote, const char *local,
628 int summary_width)
d0b39a03 629{
901f3d40
JH
630 int width = (summary_width + strlen(summary) - gettext_width(summary));
631
632 strbuf_addf(display, "%c %-*s ", code, width, summary);
bc437d10
NTND
633 if (!compact_format)
634 print_remote_to_local(display, remote, local);
635 else
636 print_compact(display, remote, local);
d0b39a03
NTND
637 if (error)
638 strbuf_addf(display, " (%s)", error);
639}
165f3902 640
b888d61c 641static int update_local_ref(struct ref *ref,
165f3902 642 const char *remote,
6da618d5 643 const struct ref *remote_ref,
901f3d40
JH
644 struct strbuf *display,
645 int summary_width)
b888d61c 646{
b888d61c
DB
647 struct commit *current = NULL, *updated;
648 enum object_type type;
649 struct branch *current_branch = branch_get(NULL);
4577e483 650 const char *pretty_ref = prettify_refname(ref->name);
b888d61c 651
0df8e965 652 type = oid_object_info(the_repository, &ref->new_oid, NULL);
b888d61c 653 if (type < 0)
f4e54d02 654 die(_("object %s not found"), oid_to_hex(&ref->new_oid));
b888d61c 655
f4e54d02 656 if (!oidcmp(&ref->old_oid, &ref->new_oid)) {
7f87aff2 657 if (verbosity > 0)
d0b39a03 658 format_display(display, '=', _("[up to date]"), NULL,
901f3d40 659 remote, pretty_ref, summary_width);
b888d61c
DB
660 return 0;
661 }
662
b3abdd9d
SP
663 if (current_branch &&
664 !strcmp(ref->name, current_branch->name) &&
b888d61c 665 !(update_head_ok || is_bare_repository()) &&
f4e54d02 666 !is_null_oid(&ref->old_oid)) {
b888d61c
DB
667 /*
668 * If this is the head, and it's not okay to update
669 * the head, and the old value of the head isn't empty...
670 */
d0b39a03
NTND
671 format_display(display, '!', _("[rejected]"),
672 _("can't fetch in current branch"),
901f3d40 673 remote, pretty_ref, summary_width);
b888d61c
DB
674 return 1;
675 }
676
f4e54d02 677 if (!is_null_oid(&ref->old_oid) &&
59556548 678 starts_with(ref->name, "refs/tags/")) {
6315472e
JK
679 int r;
680 r = s_update_ref("updating tag", ref, 0);
2cb040ba 681 format_display(display, r ? '!' : 't', _("[tag update]"),
d0b39a03 682 r ? _("unable to update local ref") : NULL,
901f3d40 683 remote, pretty_ref, summary_width);
6315472e 684 return r;
b888d61c
DB
685 }
686
bc83266a 687 current = lookup_commit_reference_gently(&ref->old_oid, 1);
688 updated = lookup_commit_reference_gently(&ref->new_oid, 1);
b888d61c 689 if (!current || !updated) {
165f3902
NP
690 const char *msg;
691 const char *what;
6315472e 692 int r;
0997adaa
MB
693 /*
694 * Nicely describe the new ref we're fetching.
695 * Base this on the remote's ref name, as it's
696 * more likely to follow a standard layout.
697 */
698 const char *name = remote_ref ? remote_ref->name : "";
59556548 699 if (starts_with(name, "refs/tags/")) {
b888d61c 700 msg = "storing tag";
f7b3742a 701 what = _("[new tag]");
59556548 702 } else if (starts_with(name, "refs/heads/")) {
b888d61c 703 msg = "storing head";
f7b3742a 704 what = _("[new branch]");
0997adaa
MB
705 } else {
706 msg = "storing ref";
707 what = _("[new ref]");
165f3902
NP
708 }
709
a6801adc
JL
710 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
711 (recurse_submodules != RECURSE_SUBMODULES_ON))
2eb80bcd 712 check_for_new_submodule_commits(&ref->new_oid);
6315472e 713 r = s_update_ref(msg, ref, 0);
d0b39a03
NTND
714 format_display(display, r ? '!' : '*', what,
715 r ? _("unable to update local ref") : NULL,
901f3d40 716 remote, pretty_ref, summary_width);
6315472e 717 return r;
b888d61c
DB
718 }
719
a20efee9 720 if (in_merge_bases(current, updated)) {
bd22d4ff 721 struct strbuf quickref = STRBUF_INIT;
6315472e 722 int r;
30e677e0 723 strbuf_add_unique_abbrev(&quickref, &current->object.oid, DEFAULT_ABBREV);
bd22d4ff 724 strbuf_addstr(&quickref, "..");
30e677e0 725 strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
88a21979
JL
726 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
727 (recurse_submodules != RECURSE_SUBMODULES_ON))
2eb80bcd 728 check_for_new_submodule_commits(&ref->new_oid);
a75d7b54 729 r = s_update_ref("fast-forward", ref, 1);
d0b39a03
NTND
730 format_display(display, r ? '!' : ' ', quickref.buf,
731 r ? _("unable to update local ref") : NULL,
901f3d40 732 remote, pretty_ref, summary_width);
bd22d4ff 733 strbuf_release(&quickref);
6315472e 734 return r;
165f3902 735 } else if (force || ref->force) {
bd22d4ff 736 struct strbuf quickref = STRBUF_INIT;
6315472e 737 int r;
30e677e0 738 strbuf_add_unique_abbrev(&quickref, &current->object.oid, DEFAULT_ABBREV);
bd22d4ff 739 strbuf_addstr(&quickref, "...");
30e677e0 740 strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
88a21979
JL
741 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
742 (recurse_submodules != RECURSE_SUBMODULES_ON))
2eb80bcd 743 check_for_new_submodule_commits(&ref->new_oid);
6315472e 744 r = s_update_ref("forced-update", ref, 1);
d0b39a03
NTND
745 format_display(display, r ? '!' : '+', quickref.buf,
746 r ? _("unable to update local ref") : _("forced update"),
901f3d40 747 remote, pretty_ref, summary_width);
bd22d4ff 748 strbuf_release(&quickref);
6315472e 749 return r;
165f3902 750 } else {
d0b39a03 751 format_display(display, '!', _("[rejected]"), _("non-fast-forward"),
901f3d40 752 remote, pretty_ref, summary_width);
b888d61c
DB
753 return 1;
754 }
b888d61c
DB
755}
756
6ccac9ee 757static int iterate_ref_map(void *cb_data, struct object_id *oid)
6b67e0dc 758{
f0e278b1
JH
759 struct ref **rm = cb_data;
760 struct ref *ref = *rm;
6b67e0dc 761
4820a33b
NTND
762 while (ref && ref->status == REF_STATUS_REJECT_SHALLOW)
763 ref = ref->next;
f0e278b1
JH
764 if (!ref)
765 return -1; /* end of the list */
766 *rm = ref->next;
6ccac9ee 767 oidcpy(oid, &ref->old_oid);
f0e278b1 768 return 0;
6b67e0dc
JH
769}
770
47abd85b 771static int store_updated_refs(const char *raw_url, const char *remote_name,
cf1e7c07 772 int connectivity_checked, struct ref *ref_map)
b888d61c
DB
773{
774 FILE *fp;
775 struct commit *commit;
4b3b33a7 776 int url_len, i, rc = 0;
5914f2d0 777 struct strbuf note = STRBUF_INIT;
b888d61c
DB
778 const char *what, *kind;
779 struct ref *rm;
dcf69262 780 char *url;
f932729c 781 const char *filename = dry_run ? "/dev/null" : git_path_fetch_head();
900f2814 782 int want_status;
11fd66de 783 int summary_width = transport_summary_width(ref_map);
b888d61c 784
d6617c7c
AGR
785 fp = fopen(filename, "a");
786 if (!fp)
6da31d7f 787 return error_errno(_("cannot open %s"), filename);
47abd85b 788
fb0cc87e
DB
789 if (raw_url)
790 url = transport_anonymize_url(raw_url);
791 else
792 url = xstrdup("foreign");
6b67e0dc 793
cf1e7c07
JT
794 if (!connectivity_checked) {
795 rm = ref_map;
796 if (check_connected(iterate_ref_map, &rm, NULL)) {
797 rc = error(_("%s did not send all necessary objects\n"), url);
798 goto abort;
799 }
9516a598 800 }
6b67e0dc 801
6bc91f23
NTND
802 prepare_format_display(ref_map);
803
96890f4c 804 /*
900f2814
JK
805 * We do a pass for each fetch_head_status type in their enum order, so
806 * merged entries are written before not-for-merge. That lets readers
807 * use FETCH_HEAD as a refname to refer to the ref to be merged.
96890f4c 808 */
900f2814
JK
809 for (want_status = FETCH_HEAD_MERGE;
810 want_status <= FETCH_HEAD_IGNORE;
811 want_status++) {
96890f4c
JH
812 for (rm = ref_map; rm; rm = rm->next) {
813 struct ref *ref = NULL;
900f2814 814 const char *merge_status_marker = "";
96890f4c 815
4820a33b
NTND
816 if (rm->status == REF_STATUS_REJECT_SHALLOW) {
817 if (want_status == FETCH_HEAD_MERGE)
818 warning(_("reject %s because shallow roots are not allowed to be updated"),
819 rm->peer_ref ? rm->peer_ref->name : rm->name);
820 continue;
821 }
822
bc83266a 823 commit = lookup_commit_reference_gently(&rm->old_oid,
824 1);
96890f4c 825 if (!commit)
900f2814 826 rm->fetch_head_status = FETCH_HEAD_NOT_FOR_MERGE;
96890f4c 827
900f2814 828 if (rm->fetch_head_status != want_status)
96890f4c
JH
829 continue;
830
831 if (rm->peer_ref) {
6f687c21 832 ref = alloc_ref(rm->peer_ref->name);
f4e54d02 833 oidcpy(&ref->old_oid, &rm->peer_ref->old_oid);
834 oidcpy(&ref->new_oid, &rm->old_oid);
96890f4c
JH
835 ref->force = rm->peer_ref->force;
836 }
b888d61c 837
b888d61c 838
96890f4c
JH
839 if (!strcmp(rm->name, "HEAD")) {
840 kind = "";
841 what = "";
842 }
59556548 843 else if (starts_with(rm->name, "refs/heads/")) {
96890f4c
JH
844 kind = "branch";
845 what = rm->name + 11;
846 }
59556548 847 else if (starts_with(rm->name, "refs/tags/")) {
96890f4c
JH
848 kind = "tag";
849 what = rm->name + 10;
850 }
59556548 851 else if (starts_with(rm->name, "refs/remotes/")) {
96890f4c
JH
852 kind = "remote-tracking branch";
853 what = rm->name + 13;
854 }
855 else {
856 kind = "";
857 what = rm->name;
858 }
b888d61c 859
96890f4c
JH
860 url_len = strlen(url);
861 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
862 ;
863 url_len = i + 1;
864 if (4 < i && !strncmp(".git", url + i - 3, 4))
865 url_len = i - 3;
866
867 strbuf_reset(&note);
868 if (*what) {
869 if (*kind)
870 strbuf_addf(&note, "%s ", kind);
871 strbuf_addf(&note, "'%s' of ", what);
872 }
900f2814
JK
873 switch (rm->fetch_head_status) {
874 case FETCH_HEAD_NOT_FOR_MERGE:
875 merge_status_marker = "not-for-merge";
876 /* fall-through */
877 case FETCH_HEAD_MERGE:
878 fprintf(fp, "%s\t%s\t%s",
f4e54d02 879 oid_to_hex(&rm->old_oid),
900f2814
JK
880 merge_status_marker,
881 note.buf);
882 for (i = 0; i < url_len; ++i)
883 if ('\n' == url[i])
884 fputs("\\n", fp);
885 else
886 fputc(url[i], fp);
887 fputc('\n', fp);
888 break;
889 default:
890 /* do not write anything to FETCH_HEAD */
891 break;
892 }
96890f4c
JH
893
894 strbuf_reset(&note);
895 if (ref) {
901f3d40
JH
896 rc |= update_local_ref(ref, what, rm, &note,
897 summary_width);
96890f4c
JH
898 free(ref);
899 } else
d0b39a03
NTND
900 format_display(&note, '*',
901 *kind ? kind : "branch", NULL,
902 *what ? what : "HEAD",
901f3d40 903 "FETCH_HEAD", summary_width);
96890f4c
JH
904 if (note.len) {
905 if (verbosity >= 0 && !shown_url) {
906 fprintf(stderr, _("From %.*s\n"),
907 url_len, url);
908 shown_url = 1;
909 }
910 if (verbosity >= 0)
911 fprintf(stderr, " %s\n", note.buf);
165f3902
NP
912 }
913 }
b888d61c 914 }
9516a598 915
fa250759 916 if (rc & STORE_REF_ERROR_DF_CONFLICT)
bd4a51fc 917 error(_("some local refs could not be updated; try running\n"
f3cb169b 918 " 'git remote prune %s' to remove any old, conflicting "
bd4a51fc 919 "branches"), remote_name);
9516a598
TRC
920
921 abort:
5914f2d0 922 strbuf_release(&note);
9516a598
TRC
923 free(url);
924 fclose(fp);
efb98b44 925 return rc;
b888d61c
DB
926}
927
4191c356
SP
928/*
929 * We would want to bypass the object transfer altogether if
d9eb0205 930 * everything we are going to fetch already exists and is connected
4191c356 931 * locally.
4191c356
SP
932 */
933static int quickfetch(struct ref *ref_map)
934{
f0e278b1 935 struct ref *rm = ref_map;
7043c707 936 struct check_connected_options opt = CHECK_CONNECTED_INIT;
f0e278b1 937
4191c356
SP
938 /*
939 * If we are deepening a shallow clone we already have these
940 * objects reachable. Running rev-list here will return with
941 * a good (0) exit status and we'll bypass the fetch that we
942 * really need to perform. Claiming failure now will ensure
943 * we perform the network exchange to deepen our history.
944 */
508ea882 945 if (deepen)
4191c356 946 return -1;
7043c707
JK
947 opt.quiet = 1;
948 return check_connected(iterate_ref_map, &rm, &opt);
4191c356
SP
949}
950
989b8c44
BW
951static int fetch_refs(struct transport *transport, struct ref *ref_map,
952 struct ref **updated_remote_refs)
b888d61c 953{
4191c356
SP
954 int ret = quickfetch(ref_map);
955 if (ret)
989b8c44
BW
956 ret = transport_fetch_refs(transport, ref_map,
957 updated_remote_refs);
b888d61c 958 if (!ret)
05c44226
BW
959 /*
960 * Keep the new pack's ".keep" file around to allow the caller
961 * time to update refs to reference the new objects.
962 */
963 return 0;
964 transport_unlock_pack(transport);
965 return ret;
966}
967
968/* Update local refs based on the ref values fetched from a remote */
969static int consume_refs(struct transport *transport, struct ref *ref_map)
970{
cf1e7c07
JT
971 int connectivity_checked = transport->smart_options
972 ? transport->smart_options->connectivity_checked : 0;
05c44226
BW
973 int ret = store_updated_refs(transport->url,
974 transport->remote->name,
cf1e7c07 975 connectivity_checked,
05c44226 976 ref_map);
1788c39c 977 transport_unlock_pack(transport);
b888d61c
DB
978 return ret;
979}
980
def11e71
BW
981static int prune_refs(struct refspec *rs, struct ref *ref_map,
982 const char *raw_url)
f360d844 983{
4b3b33a7 984 int url_len, i, result = 0;
a2ac50cb 985 struct ref *ref, *stale_refs = get_stale_heads(rs, ref_map);
4b3b33a7 986 char *url;
11fd66de 987 int summary_width = transport_summary_width(stale_refs);
f360d844 988 const char *dangling_msg = dry_run
18986d53
NTND
989 ? _(" (%s will become dangling)")
990 : _(" (%s has become dangling)");
f360d844 991
4b3b33a7
TM
992 if (raw_url)
993 url = transport_anonymize_url(raw_url);
994 else
995 url = xstrdup("foreign");
996
997 url_len = strlen(url);
998 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
999 ;
1000
1001 url_len = i + 1;
1002 if (4 < i && !strncmp(".git", url + i - 3, 4))
1003 url_len = i - 3;
1004
a087b432
MH
1005 if (!dry_run) {
1006 struct string_list refnames = STRING_LIST_INIT_NODUP;
1007
1008 for (ref = stale_refs; ref; ref = ref->next)
1009 string_list_append(&refnames, ref->name);
1010
64da4199 1011 result = delete_refs("fetch: prune", &refnames, 0);
a087b432
MH
1012 string_list_clear(&refnames, 0);
1013 }
1014
1015 if (verbosity >= 0) {
1016 for (ref = stale_refs; ref; ref = ref->next) {
d0b39a03 1017 struct strbuf sb = STRBUF_INIT;
a087b432
MH
1018 if (!shown_url) {
1019 fprintf(stderr, _("From %.*s\n"), url_len, url);
1020 shown_url = 1;
1021 }
2cb040ba 1022 format_display(&sb, '-', _("[deleted]"), NULL,
901f3d40
JH
1023 _("(none)"), prettify_refname(ref->name),
1024 summary_width);
d0b39a03
NTND
1025 fprintf(stderr, " %s\n",sb.buf);
1026 strbuf_release(&sb);
f360d844
JS
1027 warn_dangling_symref(stderr, dangling_msg, ref->name);
1028 }
1029 }
a087b432 1030
4b3b33a7 1031 free(url);
f360d844
JS
1032 free_refs(stale_refs);
1033 return result;
1034}
1035
8ee5d731
JS
1036static void check_not_current_branch(struct ref *ref_map)
1037{
1038 struct branch *current_branch = branch_get(NULL);
1039
1040 if (is_bare_repository() || !current_branch)
1041 return;
1042
1043 for (; ref_map; ref_map = ref_map->next)
1044 if (ref_map->peer_ref && !strcmp(current_branch->refname,
1045 ref_map->peer_ref->name))
bd4a51fc
ÆAB
1046 die(_("Refusing to fetch into current branch %s "
1047 "of non-bare repository"), current_branch->refname);
8ee5d731
JS
1048}
1049
e6cc5104
JH
1050static int truncate_fetch_head(void)
1051{
f932729c 1052 const char *filename = git_path_fetch_head();
ea56518d 1053 FILE *fp = fopen_for_writing(filename);
e6cc5104
JH
1054
1055 if (!fp)
6da31d7f 1056 return error_errno(_("cannot open %s"), filename);
e6cc5104
JH
1057 fclose(fp);
1058 return 0;
1059}
1060
db5723c6
JH
1061static void set_option(struct transport *transport, const char *name, const char *value)
1062{
1063 int r = transport_set_option(transport, name, value);
1064 if (r < 0)
1065 die(_("Option \"%s\" value \"%s\" is not valid for %s"),
1066 name, value, transport->url);
1067 if (r > 0)
1068 warning(_("Option \"%s\" is ignored for %s\n"),
1069 name, transport->url);
1070}
1071
508ea882 1072static struct transport *prepare_transport(struct remote *remote, int deepen)
db5723c6
JH
1073{
1074 struct transport *transport;
1075 transport = transport_get(remote, NULL);
1076 transport_set_verbosity(transport, verbosity, progress);
c915f11e 1077 transport->family = family;
db5723c6
JH
1078 if (upload_pack)
1079 set_option(transport, TRANS_OPT_UPLOADPACK, upload_pack);
1080 if (keep)
1081 set_option(transport, TRANS_OPT_KEEP, "yes");
1082 if (depth)
1083 set_option(transport, TRANS_OPT_DEPTH, depth);
508ea882
NTND
1084 if (deepen && deepen_since)
1085 set_option(transport, TRANS_OPT_DEEPEN_SINCE, deepen_since);
a45a2600
NTND
1086 if (deepen && deepen_not.nr)
1087 set_option(transport, TRANS_OPT_DEEPEN_NOT,
1088 (const char *)&deepen_not);
cccf74e2
NTND
1089 if (deepen_relative)
1090 set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, "yes");
48d25cae
NTND
1091 if (update_shallow)
1092 set_option(transport, TRANS_OPT_UPDATE_SHALLOW, "yes");
acb0c572
JH
1093 if (filter_options.choice) {
1094 set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER,
1095 filter_options.filter_spec);
1096 set_option(transport, TRANS_OPT_FROM_PROMISOR, "1");
1097 }
db5723c6
JH
1098 return transport;
1099}
1100
069d5032
JH
1101static void backfill_tags(struct transport *transport, struct ref *ref_map)
1102{
508ea882
NTND
1103 int cannot_reuse;
1104
1105 /*
1106 * Once we have set TRANS_OPT_DEEPEN_SINCE, we can't unset it
1107 * when remote helper is used (setting it to an empty string
1108 * is not unsetting). We could extend the remote helper
1109 * protocol for that, but for now, just force a new connection
a45a2600 1110 * without deepen-since. Similar story for deepen-not.
508ea882 1111 */
a45a2600
NTND
1112 cannot_reuse = transport->cannot_reuse ||
1113 deepen_since || deepen_not.nr;
508ea882
NTND
1114 if (cannot_reuse) {
1115 gsecondary = prepare_transport(transport->remote, 0);
b26ed430
JH
1116 transport = gsecondary;
1117 }
1118
069d5032
JH
1119 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
1120 transport_set_option(transport, TRANS_OPT_DEPTH, "0");
cccf74e2 1121 transport_set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, NULL);
989b8c44 1122 if (!fetch_refs(transport, ref_map, NULL))
05c44226 1123 consume_refs(transport, ref_map);
b26ed430
JH
1124
1125 if (gsecondary) {
1126 transport_disconnect(gsecondary);
1127 gsecondary = NULL;
1128 }
069d5032
JH
1129}
1130
b888d61c 1131static int do_fetch(struct transport *transport,
65a1301f 1132 struct refspec *rs)
b888d61c 1133{
7f98428d 1134 struct ref *ref_map;
b888d61c 1135 int autotags = (transport->remote->fetch_tags == 1);
5b87d8d3 1136 int retcode = 0;
6d1700d5 1137 const struct ref *remote_refs;
989b8c44 1138 struct ref *updated_remote_refs = NULL;
6d1700d5 1139 struct argv_array ref_prefixes = ARGV_ARRAY_INIT;
b1a01e1c 1140
ed368546
DJ
1141 if (tags == TAGS_DEFAULT) {
1142 if (transport->remote->fetch_tags == 2)
1143 tags = TAGS_SET;
1144 if (transport->remote->fetch_tags == -1)
1145 tags = TAGS_UNSET;
1146 }
b888d61c 1147
b888d61c 1148 /* if not appending, truncate FETCH_HEAD */
28a15401 1149 if (!append && !dry_run) {
5b87d8d3
MH
1150 retcode = truncate_fetch_head();
1151 if (retcode)
1152 goto cleanup;
d6617c7c 1153 }
b888d61c 1154
6d1700d5
BW
1155 if (rs->nr)
1156 refspec_ref_prefixes(rs, &ref_prefixes);
1157 else if (transport->remote && transport->remote->fetch.nr)
1158 refspec_ref_prefixes(&transport->remote->fetch, &ref_prefixes);
1159
1160 if (ref_prefixes.argc &&
1161 (tags == TAGS_SET || (tags == TAGS_DEFAULT && !rs->nr))) {
1162 argv_array_push(&ref_prefixes, "refs/tags/");
1163 }
1164
1165 remote_refs = transport_get_remote_refs(transport, &ref_prefixes);
1166 argv_array_clear(&ref_prefixes);
1167
1168 ref_map = get_ref_map(transport->remote, remote_refs, rs,
1169 tags, &autotags);
8ee5d731
JS
1170 if (!update_head_ok)
1171 check_not_current_branch(ref_map);
b888d61c 1172
41fa7d2e
SP
1173 if (tags == TAGS_DEFAULT && autotags)
1174 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
ed43de6e 1175 if (prune) {
0838bf47
MH
1176 /*
1177 * We only prune based on refspecs specified
1178 * explicitly (via command line or configuration); we
1179 * don't care whether --tags was specified.
1180 */
65a1301f 1181 if (rs->nr) {
def11e71 1182 prune_refs(rs, ref_map, transport->url);
e8c1e6c7 1183 } else {
def11e71 1184 prune_refs(&transport->remote->fetch,
4b3b33a7
TM
1185 ref_map,
1186 transport->url);
e8c1e6c7 1187 }
ed43de6e 1188 }
989b8c44
BW
1189
1190 if (fetch_refs(transport, ref_map, &updated_remote_refs)) {
1191 free_refs(ref_map);
1192 retcode = 1;
1193 goto cleanup;
1194 }
1195 if (updated_remote_refs) {
1196 /*
1197 * Regenerate ref_map using the updated remote refs. This is
1198 * to account for additional information which may be provided
1199 * by the transport (e.g. shallow info).
1200 */
1201 free_refs(ref_map);
1202 ref_map = get_ref_map(transport->remote, updated_remote_refs, rs,
1203 tags, &autotags);
1204 free_refs(updated_remote_refs);
1205 }
1206 if (consume_refs(transport, ref_map)) {
10a6cc88
TM
1207 free_refs(ref_map);
1208 retcode = 1;
1209 goto cleanup;
1210 }
7f98428d 1211 free_refs(ref_map);
b888d61c
DB
1212
1213 /* if neither --no-tags nor --tags was specified, do automated tag
1214 * following ... */
83201998 1215 if (tags == TAGS_DEFAULT && autotags) {
c50b2b47
SP
1216 struct ref **tail = &ref_map;
1217 ref_map = NULL;
6d1700d5 1218 find_non_local_tags(remote_refs, &ref_map, &tail);
069d5032
JH
1219 if (ref_map)
1220 backfill_tags(transport, ref_map);
b888d61c
DB
1221 free_refs(ref_map);
1222 }
1223
5b87d8d3 1224 cleanup:
5b87d8d3 1225 return retcode;
b888d61c
DB
1226}
1227
9c4a036b
BG
1228static int get_one_remote_for_fetch(struct remote *remote, void *priv)
1229{
1230 struct string_list *list = priv;
7cc91a2f 1231 if (!remote->skip_default_update)
1d2f80fa 1232 string_list_append(list, remote->name);
9c4a036b
BG
1233 return 0;
1234}
1235
1236struct remote_group_data {
1237 const char *name;
1238 struct string_list *list;
1239};
1240
1241static int get_remote_group(const char *key, const char *value, void *priv)
1242{
1243 struct remote_group_data *g = priv;
1244
bc598c32 1245 if (skip_prefix(key, "remotes.", &key) && !strcmp(key, g->name)) {
9c4a036b 1246 /* split list by white space */
9c4a036b 1247 while (*value) {
5f65499f
MH
1248 size_t wordlen = strcspn(value, " \t\n");
1249
e286542d 1250 if (wordlen >= 1)
b7410f61 1251 string_list_append_nodup(g->list,
e286542d
MH
1252 xstrndup(value, wordlen));
1253 value += wordlen + (value[wordlen] != '\0');
9c4a036b
BG
1254 }
1255 }
1256
1257 return 0;
1258}
1259
1260static int add_remote_or_group(const char *name, struct string_list *list)
1261{
1262 int prev_nr = list->nr;
66dbfd55
GV
1263 struct remote_group_data g;
1264 g.name = name; g.list = list;
9c4a036b
BG
1265
1266 git_config(get_remote_group, &g);
1267 if (list->nr == prev_nr) {
674468b3 1268 struct remote *remote = remote_get(name);
e459b073 1269 if (!remote_is_configured(remote, 0))
9c4a036b 1270 return 0;
1d2f80fa 1271 string_list_append(list, remote->name);
9c4a036b
BG
1272 }
1273 return 1;
1274}
1275
85556d4e 1276static void add_options_to_argv(struct argv_array *argv)
9c4a036b 1277{
28a15401 1278 if (dry_run)
85556d4e 1279 argv_array_push(argv, "--dry-run");
90765fa3
MH
1280 if (prune != -1)
1281 argv_array_push(argv, prune ? "--prune" : "--no-prune");
97716d21
ÆAB
1282 if (prune_tags != -1)
1283 argv_array_push(argv, prune_tags ? "--prune-tags" : "--no-prune-tags");
bba5322a 1284 if (update_head_ok)
85556d4e 1285 argv_array_push(argv, "--update-head-ok");
bba5322a 1286 if (force)
85556d4e 1287 argv_array_push(argv, "--force");
bba5322a 1288 if (keep)
85556d4e 1289 argv_array_push(argv, "--keep");
be254a0e 1290 if (recurse_submodules == RECURSE_SUBMODULES_ON)
85556d4e 1291 argv_array_push(argv, "--recurse-submodules");
8f0700dd 1292 else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND)
85556d4e 1293 argv_array_push(argv, "--recurse-submodules=on-demand");
85566460
DJ
1294 if (tags == TAGS_SET)
1295 argv_array_push(argv, "--tags");
1296 else if (tags == TAGS_UNSET)
1297 argv_array_push(argv, "--no-tags");
9c4a036b 1298 if (verbosity >= 2)
85556d4e 1299 argv_array_push(argv, "-v");
9c4a036b 1300 if (verbosity >= 1)
85556d4e 1301 argv_array_push(argv, "-v");
9c4a036b 1302 else if (verbosity < 0)
85556d4e 1303 argv_array_push(argv, "-q");
7dce19d3
JL
1304
1305}
1306
1307static int fetch_multiple(struct string_list *list)
1308{
1309 int i, result = 0;
85556d4e 1310 struct argv_array argv = ARGV_ARRAY_INIT;
9c4a036b 1311
e6cc5104
JH
1312 if (!append && !dry_run) {
1313 int errcode = truncate_fetch_head();
1314 if (errcode)
1315 return errcode;
1316 }
1317
85556d4e
JK
1318 argv_array_pushl(&argv, "fetch", "--append", NULL);
1319 add_options_to_argv(&argv);
1320
9c4a036b
BG
1321 for (i = 0; i < list->nr; i++) {
1322 const char *name = list->items[i].string;
85556d4e 1323 argv_array_push(&argv, name);
9c4a036b 1324 if (verbosity >= 0)
bd4a51fc 1325 printf(_("Fetching %s\n"), name);
85556d4e 1326 if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
bd4a51fc 1327 error(_("Could not fetch %s"), name);
9c4a036b
BG
1328 result = 1;
1329 }
85556d4e 1330 argv_array_pop(&argv);
9c4a036b
BG
1331 }
1332
85556d4e 1333 argv_array_clear(&argv);
9c4a036b
BG
1334 return result;
1335}
1336
aa57b871
JH
1337/*
1338 * Fetching from the promisor remote should use the given filter-spec
1339 * or inherit the default filter-spec from the config.
1340 */
1341static inline void fetch_one_setup_partial(struct remote *remote)
1342{
1343 /*
1344 * Explicit --no-filter argument overrides everything, regardless
1345 * of any prior partial clones and fetches.
1346 */
1347 if (filter_options.no_filter)
1348 return;
1349
1350 /*
1351 * If no prior partial clone/fetch and the current fetch DID NOT
1352 * request a partial-fetch, do a normal fetch.
1353 */
1354 if (!repository_format_partial_clone && !filter_options.choice)
1355 return;
1356
1357 /*
1358 * If this is the FIRST partial-fetch request, we enable partial
1359 * on this repo and remember the given filter-spec as the default
1360 * for subsequent fetches to this remote.
1361 */
1362 if (!repository_format_partial_clone && filter_options.choice) {
1363 partial_clone_register(remote->name, &filter_options);
1364 return;
1365 }
1366
1367 /*
1368 * We are currently limited to only ONE promisor remote and only
1369 * allow partial-fetches from the promisor remote.
1370 */
1371 if (strcmp(remote->name, repository_format_partial_clone)) {
1372 if (filter_options.choice)
1373 die(_("--filter can only be used with the remote configured in core.partialClone"));
1374 return;
1375 }
1376
1377 /*
1378 * Do a partial-fetch from the promisor remote using either the
1379 * explicitly given filter-spec or inherit the filter-spec from
1380 * the config.
1381 */
1382 if (!filter_options.choice)
1383 partial_clone_get_default_filter_spec(&filter_options);
1384 return;
1385}
1386
97716d21 1387static int fetch_one(struct remote *remote, int argc, const char **argv, int prune_tags_ok)
b888d61c 1388{
d7c8e307
BW
1389 struct refspec rs = REFSPEC_INIT_FETCH;
1390 int i;
7b7f39ea 1391 int exit_code;
6317972c
ÆAB
1392 int maybe_prune_tags;
1393 int remote_via_config = remote_is_configured(remote, 0);
b888d61c 1394
fa685bdf 1395 if (!remote)
bd4a51fc
ÆAB
1396 die(_("No remote repository specified. Please, specify either a URL or a\n"
1397 "remote name from which new revisions should be fetched."));
fa685bdf 1398
508ea882 1399 gtransport = prepare_transport(remote, 1);
737c5a9c
MS
1400
1401 if (prune < 0) {
1402 /* no command line request */
07118832
ÆAB
1403 if (0 <= remote->prune)
1404 prune = remote->prune;
737c5a9c
MS
1405 else if (0 <= fetch_prune_config)
1406 prune = fetch_prune_config;
1407 else
1408 prune = PRUNE_BY_DEFAULT;
1409 }
1410
97716d21
ÆAB
1411 if (prune_tags < 0) {
1412 /* no command line request */
1413 if (0 <= remote->prune_tags)
1414 prune_tags = remote->prune_tags;
1415 else if (0 <= fetch_prune_tags_config)
1416 prune_tags = fetch_prune_tags_config;
1417 else
1418 prune_tags = PRUNE_TAGS_BY_DEFAULT;
1419 }
1420
6317972c
ÆAB
1421 maybe_prune_tags = prune_tags_ok && prune_tags;
1422 if (maybe_prune_tags && remote_via_config)
95303500 1423 refspec_append(&remote->fetch, TAG_REFSPEC);
97716d21 1424
d7c8e307
BW
1425 if (maybe_prune_tags && (argc || !remote_via_config))
1426 refspec_append(&rs, TAG_REFSPEC);
6317972c 1427
d7c8e307
BW
1428 for (i = 0; i < argc; i++) {
1429 if (!strcmp(argv[i], "tag")) {
1430 char *tag;
1431 i++;
1432 if (i >= argc)
1433 die(_("You need to specify a tag name."));
1434
1435 tag = xstrfmt("refs/tags/%s:refs/tags/%s",
1436 argv[i], argv[i]);
1437 refspec_append(&rs, tag);
1438 free(tag);
1439 } else {
1440 refspec_append(&rs, argv[i]);
b888d61c 1441 }
b888d61c
DB
1442 }
1443
5e3548ef
BW
1444 if (server_options.nr)
1445 gtransport->server_options = &server_options;
1446
57b235a4 1447 sigchain_push_common(unlock_pack_on_signal);
e4022ed2 1448 atexit(unlock_pack);
65a1301f 1449 exit_code = do_fetch(gtransport, &rs);
d7c8e307 1450 refspec_clear(&rs);
af234459
JH
1451 transport_disconnect(gtransport);
1452 gtransport = NULL;
7b7f39ea 1453 return exit_code;
b888d61c 1454}
9c4a036b
BG
1455
1456int cmd_fetch(int argc, const char **argv, const char *prefix)
1457{
1458 int i;
b7410f61 1459 struct string_list list = STRING_LIST_INIT_DUP;
a1743343 1460 struct remote *remote = NULL;
9c4a036b 1461 int result = 0;
c1a7902f 1462 int prune_tags_ok = 1;
1991006c 1463 struct argv_array argv_gc_auto = ARGV_ARRAY_INIT;
9c4a036b 1464
bbc30f99
JK
1465 packet_trace_identity("fetch");
1466
acb0c572
JH
1467 fetch_if_missing = 0;
1468
9c4a036b
BG
1469 /* Record the command line for the reflog */
1470 strbuf_addstr(&default_rla, "fetch");
1471 for (i = 1; i < argc; i++)
1472 strbuf_addf(&default_rla, " %s", argv[i]);
1473
f20e7c1e 1474 config_from_gitmodules(gitmodules_fetch_config, NULL);
737c5a9c
MS
1475 git_config(git_fetch_config, NULL);
1476
9c4a036b
BG
1477 argc = parse_options(argc, argv, prefix,
1478 builtin_fetch_options, builtin_fetch_usage, 0);
1479
cccf74e2
NTND
1480 if (deepen_relative) {
1481 if (deepen_relative < 0)
1482 die(_("Negative depth in --deepen is not supported"));
1483 if (depth)
1484 die(_("--deepen and --depth are mutually exclusive"));
1485 depth = xstrfmt("%d", deepen_relative);
1486 }
4dcb167f
NTND
1487 if (unshallow) {
1488 if (depth)
1489 die(_("--depth and --unshallow cannot be used together"));
1490 else if (!is_repository_shallow())
1491 die(_("--unshallow on a complete repository does not make sense"));
2805bb59
JK
1492 else
1493 depth = xstrfmt("%d", INFINITE_DEPTH);
4dcb167f
NTND
1494 }
1495
5594bcad
NTND
1496 /* no need to be strict, transport_set_option() will validate it again */
1497 if (depth && atoi(depth) < 1)
1498 die(_("depth %s is not a positive number"), depth);
a45a2600 1499 if (depth || deepen_since || deepen_not.nr)
508ea882 1500 deepen = 1;
5594bcad 1501
acb0c572
JH
1502 if (filter_options.choice && !repository_format_partial_clone)
1503 die("--filter can only be used when extensions.partialClone is set");
1504
9c4a036b
BG
1505 if (all) {
1506 if (argc == 1)
bd4a51fc 1507 die(_("fetch --all does not take a repository argument"));
9c4a036b 1508 else if (argc > 1)
bd4a51fc 1509 die(_("fetch --all does not make sense with refspecs"));
9c4a036b 1510 (void) for_each_remote(get_one_remote_for_fetch, &list);
9c4a036b
BG
1511 } else if (argc == 0) {
1512 /* No arguments -- use default remote */
1513 remote = remote_get(NULL);
16679e37
BG
1514 } else if (multiple) {
1515 /* All arguments are assumed to be remotes or groups */
1516 for (i = 0; i < argc; i++)
1517 if (!add_remote_or_group(argv[i], &list))
bd4a51fc 1518 die(_("No such remote or remote group: %s"), argv[i]);
9c4a036b
BG
1519 } else {
1520 /* Single remote or group */
1521 (void) add_remote_or_group(argv[0], &list);
1522 if (list.nr > 1) {
1523 /* More than one remote */
1524 if (argc > 1)
bd4a51fc 1525 die(_("Fetching a group and specifying refspecs does not make sense"));
9c4a036b
BG
1526 } else {
1527 /* Zero or one remotes */
1528 remote = remote_get(argv[0]);
c1a7902f 1529 prune_tags_ok = (argc == 1);
a1743343
JT
1530 argc--;
1531 argv++;
9c4a036b
BG
1532 }
1533 }
1534
acb0c572 1535 if (remote) {
aa57b871
JH
1536 if (filter_options.choice || repository_format_partial_clone)
1537 fetch_one_setup_partial(remote);
c1a7902f 1538 result = fetch_one(remote, argc, argv, prune_tags_ok);
acb0c572
JH
1539 } else {
1540 if (filter_options.choice)
1541 die(_("--filter can only be used with the remote configured in core.partialClone"));
aa57b871 1542 /* TODO should this also die if we have a previous partial-clone? */
a1743343 1543 result = fetch_multiple(&list);
acb0c572 1544 }
a1743343 1545
be254a0e 1546 if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
85556d4e
JK
1547 struct argv_array options = ARGV_ARRAY_INIT;
1548
1549 add_options_to_argv(&options);
e724197f
BW
1550 result = fetch_populated_submodules(the_repository,
1551 &options,
7dce19d3 1552 submodule_prefix,
8f0700dd 1553 recurse_submodules,
8fa29159 1554 recurse_submodules_default,
62104ba1
SB
1555 verbosity < 0,
1556 max_children);
85556d4e 1557 argv_array_clear(&options);
7dce19d3
JL
1558 }
1559
9c4a036b
BG
1560 string_list_clear(&list, 0);
1561
d0b59866 1562 close_all_packs(the_repository->objects);
0898c962 1563
1991006c 1564 argv_array_pushl(&argv_gc_auto, "gc", "--auto", NULL);
6fceed3b
NTND
1565 if (verbosity < 0)
1566 argv_array_push(&argv_gc_auto, "--quiet");
1991006c
NTND
1567 run_command_v_opt(argv_gc_auto.argv, RUN_GIT_CMD);
1568 argv_array_clear(&argv_gc_auto);
131b8fcb 1569
9c4a036b
BG
1570 return result;
1571}