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