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