Merge branch 'ds/test-multi-pack-index'
[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 reference"), 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 (hasheq(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 && oideq(&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 (oideq(&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                 if (force || ref->force) {
672                         int r;
673                         r = s_update_ref("updating tag", ref, 0);
674                         format_display(display, r ? '!' : 't', _("[tag update]"),
675                                        r ? _("unable to update local ref") : NULL,
676                                        remote, pretty_ref, summary_width);
677                         return r;
678                 } else {
679                         format_display(display, '!', _("[rejected]"), _("would clobber existing tag"),
680                                        remote, pretty_ref, summary_width);
681                         return 1;
682                 }
683         }
684
685         current = lookup_commit_reference_gently(the_repository,
686                                                  &ref->old_oid, 1);
687         updated = lookup_commit_reference_gently(the_repository,
688                                                  &ref->new_oid, 1);
689         if (!current || !updated) {
690                 const char *msg;
691                 const char *what;
692                 int r;
693                 /*
694                  * Nicely describe the new ref we're fetching.
695                  * Base this on the remote's ref name, as it's
696                  * more likely to follow a standard layout.
697                  */
698                 const char *name = remote_ref ? remote_ref->name : "";
699                 if (starts_with(name, "refs/tags/")) {
700                         msg = "storing tag";
701                         what = _("[new tag]");
702                 } else if (starts_with(name, "refs/heads/")) {
703                         msg = "storing head";
704                         what = _("[new branch]");
705                 } else {
706                         msg = "storing ref";
707                         what = _("[new ref]");
708                 }
709
710                 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
711                     (recurse_submodules != RECURSE_SUBMODULES_ON))
712                         check_for_new_submodule_commits(&ref->new_oid);
713                 r = s_update_ref(msg, ref, 0);
714                 format_display(display, r ? '!' : '*', what,
715                                r ? _("unable to update local ref") : NULL,
716                                remote, pretty_ref, summary_width);
717                 return r;
718         }
719
720         if (in_merge_bases(current, updated)) {
721                 struct strbuf quickref = STRBUF_INIT;
722                 int r;
723                 strbuf_add_unique_abbrev(&quickref, &current->object.oid, DEFAULT_ABBREV);
724                 strbuf_addstr(&quickref, "..");
725                 strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
726                 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
727                     (recurse_submodules != RECURSE_SUBMODULES_ON))
728                         check_for_new_submodule_commits(&ref->new_oid);
729                 r = s_update_ref("fast-forward", ref, 1);
730                 format_display(display, r ? '!' : ' ', quickref.buf,
731                                r ? _("unable to update local ref") : NULL,
732                                remote, pretty_ref, summary_width);
733                 strbuf_release(&quickref);
734                 return r;
735         } else if (force || ref->force) {
736                 struct strbuf quickref = STRBUF_INIT;
737                 int r;
738                 strbuf_add_unique_abbrev(&quickref, &current->object.oid, DEFAULT_ABBREV);
739                 strbuf_addstr(&quickref, "...");
740                 strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
741                 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
742                     (recurse_submodules != RECURSE_SUBMODULES_ON))
743                         check_for_new_submodule_commits(&ref->new_oid);
744                 r = s_update_ref("forced-update", ref, 1);
745                 format_display(display, r ? '!' : '+', quickref.buf,
746                                r ? _("unable to update local ref") : _("forced update"),
747                                remote, pretty_ref, summary_width);
748                 strbuf_release(&quickref);
749                 return r;
750         } else {
751                 format_display(display, '!', _("[rejected]"), _("non-fast-forward"),
752                                remote, pretty_ref, summary_width);
753                 return 1;
754         }
755 }
756
757 static int iterate_ref_map(void *cb_data, struct object_id *oid)
758 {
759         struct ref **rm = cb_data;
760         struct ref *ref = *rm;
761
762         while (ref && ref->status == REF_STATUS_REJECT_SHALLOW)
763                 ref = ref->next;
764         if (!ref)
765                 return -1; /* end of the list */
766         *rm = ref->next;
767         oidcpy(oid, &ref->old_oid);
768         return 0;
769 }
770
771 static int store_updated_refs(const char *raw_url, const char *remote_name,
772                               int connectivity_checked, struct ref *ref_map)
773 {
774         FILE *fp;
775         struct commit *commit;
776         int url_len, i, rc = 0;
777         struct strbuf note = STRBUF_INIT;
778         const char *what, *kind;
779         struct ref *rm;
780         char *url;
781         const char *filename = dry_run ? "/dev/null" : git_path_fetch_head(the_repository);
782         int want_status;
783         int summary_width = transport_summary_width(ref_map);
784
785         fp = fopen(filename, "a");
786         if (!fp)
787                 return error_errno(_("cannot open %s"), filename);
788
789         if (raw_url)
790                 url = transport_anonymize_url(raw_url);
791         else
792                 url = xstrdup("foreign");
793
794         if (!connectivity_checked) {
795                 rm = ref_map;
796                 if (check_connected(iterate_ref_map, &rm, NULL)) {
797                         rc = error(_("%s did not send all necessary objects\n"), url);
798                         goto abort;
799                 }
800         }
801
802         prepare_format_display(ref_map);
803
804         /*
805          * We do a pass for each fetch_head_status type in their enum order, so
806          * merged entries are written before not-for-merge. That lets readers
807          * use FETCH_HEAD as a refname to refer to the ref to be merged.
808          */
809         for (want_status = FETCH_HEAD_MERGE;
810              want_status <= FETCH_HEAD_IGNORE;
811              want_status++) {
812                 for (rm = ref_map; rm; rm = rm->next) {
813                         struct ref *ref = NULL;
814                         const char *merge_status_marker = "";
815
816                         if (rm->status == REF_STATUS_REJECT_SHALLOW) {
817                                 if (want_status == FETCH_HEAD_MERGE)
818                                         warning(_("reject %s because shallow roots are not allowed to be updated"),
819                                                 rm->peer_ref ? rm->peer_ref->name : rm->name);
820                                 continue;
821                         }
822
823                         commit = lookup_commit_reference_gently(the_repository,
824                                                                 &rm->old_oid,
825                                                                 1);
826                         if (!commit)
827                                 rm->fetch_head_status = FETCH_HEAD_NOT_FOR_MERGE;
828
829                         if (rm->fetch_head_status != want_status)
830                                 continue;
831
832                         if (rm->peer_ref) {
833                                 ref = alloc_ref(rm->peer_ref->name);
834                                 oidcpy(&ref->old_oid, &rm->peer_ref->old_oid);
835                                 oidcpy(&ref->new_oid, &rm->old_oid);
836                                 ref->force = rm->peer_ref->force;
837                         }
838
839
840                         if (!strcmp(rm->name, "HEAD")) {
841                                 kind = "";
842                                 what = "";
843                         }
844                         else if (starts_with(rm->name, "refs/heads/")) {
845                                 kind = "branch";
846                                 what = rm->name + 11;
847                         }
848                         else if (starts_with(rm->name, "refs/tags/")) {
849                                 kind = "tag";
850                                 what = rm->name + 10;
851                         }
852                         else if (starts_with(rm->name, "refs/remotes/")) {
853                                 kind = "remote-tracking branch";
854                                 what = rm->name + 13;
855                         }
856                         else {
857                                 kind = "";
858                                 what = rm->name;
859                         }
860
861                         url_len = strlen(url);
862                         for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
863                                 ;
864                         url_len = i + 1;
865                         if (4 < i && !strncmp(".git", url + i - 3, 4))
866                                 url_len = i - 3;
867
868                         strbuf_reset(&note);
869                         if (*what) {
870                                 if (*kind)
871                                         strbuf_addf(&note, "%s ", kind);
872                                 strbuf_addf(&note, "'%s' of ", what);
873                         }
874                         switch (rm->fetch_head_status) {
875                         case FETCH_HEAD_NOT_FOR_MERGE:
876                                 merge_status_marker = "not-for-merge";
877                                 /* fall-through */
878                         case FETCH_HEAD_MERGE:
879                                 fprintf(fp, "%s\t%s\t%s",
880                                         oid_to_hex(&rm->old_oid),
881                                         merge_status_marker,
882                                         note.buf);
883                                 for (i = 0; i < url_len; ++i)
884                                         if ('\n' == url[i])
885                                                 fputs("\\n", fp);
886                                         else
887                                                 fputc(url[i], fp);
888                                 fputc('\n', fp);
889                                 break;
890                         default:
891                                 /* do not write anything to FETCH_HEAD */
892                                 break;
893                         }
894
895                         strbuf_reset(&note);
896                         if (ref) {
897                                 rc |= update_local_ref(ref, what, rm, &note,
898                                                        summary_width);
899                                 free(ref);
900                         } else
901                                 format_display(&note, '*',
902                                                *kind ? kind : "branch", NULL,
903                                                *what ? what : "HEAD",
904                                                "FETCH_HEAD", summary_width);
905                         if (note.len) {
906                                 if (verbosity >= 0 && !shown_url) {
907                                         fprintf(stderr, _("From %.*s\n"),
908                                                         url_len, url);
909                                         shown_url = 1;
910                                 }
911                                 if (verbosity >= 0)
912                                         fprintf(stderr, " %s\n", note.buf);
913                         }
914                 }
915         }
916
917         if (rc & STORE_REF_ERROR_DF_CONFLICT)
918                 error(_("some local refs could not be updated; try running\n"
919                       " 'git remote prune %s' to remove any old, conflicting "
920                       "branches"), remote_name);
921
922  abort:
923         strbuf_release(&note);
924         free(url);
925         fclose(fp);
926         return rc;
927 }
928
929 /*
930  * We would want to bypass the object transfer altogether if
931  * everything we are going to fetch already exists and is connected
932  * locally.
933  */
934 static int check_exist_and_connected(struct ref *ref_map)
935 {
936         struct ref *rm = ref_map;
937         struct check_connected_options opt = CHECK_CONNECTED_INIT;
938         struct ref *r;
939
940         /*
941          * If we are deepening a shallow clone we already have these
942          * objects reachable.  Running rev-list here will return with
943          * a good (0) exit status and we'll bypass the fetch that we
944          * really need to perform.  Claiming failure now will ensure
945          * we perform the network exchange to deepen our history.
946          */
947         if (deepen)
948                 return -1;
949
950         /*
951          * check_connected() allows objects to merely be promised, but
952          * we need all direct targets to exist.
953          */
954         for (r = rm; r; r = r->next) {
955                 if (!has_object_file(&r->old_oid))
956                         return -1;
957         }
958
959         opt.quiet = 1;
960         return check_connected(iterate_ref_map, &rm, &opt);
961 }
962
963 static int fetch_refs(struct transport *transport, struct ref *ref_map)
964 {
965         int ret = check_exist_and_connected(ref_map);
966         if (ret)
967                 ret = transport_fetch_refs(transport, ref_map);
968         if (!ret)
969                 /*
970                  * Keep the new pack's ".keep" file around to allow the caller
971                  * time to update refs to reference the new objects.
972                  */
973                 return 0;
974         transport_unlock_pack(transport);
975         return ret;
976 }
977
978 /* Update local refs based on the ref values fetched from a remote */
979 static int consume_refs(struct transport *transport, struct ref *ref_map)
980 {
981         int connectivity_checked = transport->smart_options
982                 ? transport->smart_options->connectivity_checked : 0;
983         int ret = store_updated_refs(transport->url,
984                                      transport->remote->name,
985                                      connectivity_checked,
986                                      ref_map);
987         transport_unlock_pack(transport);
988         return ret;
989 }
990
991 static int prune_refs(struct refspec *rs, struct ref *ref_map,
992                       const char *raw_url)
993 {
994         int url_len, i, result = 0;
995         struct ref *ref, *stale_refs = get_stale_heads(rs, ref_map);
996         char *url;
997         int summary_width = transport_summary_width(stale_refs);
998         const char *dangling_msg = dry_run
999                 ? _("   (%s will become dangling)")
1000                 : _("   (%s has become dangling)");
1001
1002         if (raw_url)
1003                 url = transport_anonymize_url(raw_url);
1004         else
1005                 url = xstrdup("foreign");
1006
1007         url_len = strlen(url);
1008         for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
1009                 ;
1010
1011         url_len = i + 1;
1012         if (4 < i && !strncmp(".git", url + i - 3, 4))
1013                 url_len = i - 3;
1014
1015         if (!dry_run) {
1016                 struct string_list refnames = STRING_LIST_INIT_NODUP;
1017
1018                 for (ref = stale_refs; ref; ref = ref->next)
1019                         string_list_append(&refnames, ref->name);
1020
1021                 result = delete_refs("fetch: prune", &refnames, 0);
1022                 string_list_clear(&refnames, 0);
1023         }
1024
1025         if (verbosity >= 0) {
1026                 for (ref = stale_refs; ref; ref = ref->next) {
1027                         struct strbuf sb = STRBUF_INIT;
1028                         if (!shown_url) {
1029                                 fprintf(stderr, _("From %.*s\n"), url_len, url);
1030                                 shown_url = 1;
1031                         }
1032                         format_display(&sb, '-', _("[deleted]"), NULL,
1033                                        _("(none)"), prettify_refname(ref->name),
1034                                        summary_width);
1035                         fprintf(stderr, " %s\n",sb.buf);
1036                         strbuf_release(&sb);
1037                         warn_dangling_symref(stderr, dangling_msg, ref->name);
1038                 }
1039         }
1040
1041         free(url);
1042         free_refs(stale_refs);
1043         return result;
1044 }
1045
1046 static void check_not_current_branch(struct ref *ref_map)
1047 {
1048         struct branch *current_branch = branch_get(NULL);
1049
1050         if (is_bare_repository() || !current_branch)
1051                 return;
1052
1053         for (; ref_map; ref_map = ref_map->next)
1054                 if (ref_map->peer_ref && !strcmp(current_branch->refname,
1055                                         ref_map->peer_ref->name))
1056                         die(_("Refusing to fetch into current branch %s "
1057                             "of non-bare repository"), current_branch->refname);
1058 }
1059
1060 static int truncate_fetch_head(void)
1061 {
1062         const char *filename = git_path_fetch_head(the_repository);
1063         FILE *fp = fopen_for_writing(filename);
1064
1065         if (!fp)
1066                 return error_errno(_("cannot open %s"), filename);
1067         fclose(fp);
1068         return 0;
1069 }
1070
1071 static void set_option(struct transport *transport, const char *name, const char *value)
1072 {
1073         int r = transport_set_option(transport, name, value);
1074         if (r < 0)
1075                 die(_("Option \"%s\" value \"%s\" is not valid for %s"),
1076                     name, value, transport->url);
1077         if (r > 0)
1078                 warning(_("Option \"%s\" is ignored for %s\n"),
1079                         name, transport->url);
1080 }
1081
1082
1083 static int add_oid(const char *refname, const struct object_id *oid, int flags,
1084                    void *cb_data)
1085 {
1086         struct oid_array *oids = cb_data;
1087
1088         oid_array_append(oids, oid);
1089         return 0;
1090 }
1091
1092 static void add_negotiation_tips(struct git_transport_options *smart_options)
1093 {
1094         struct oid_array *oids = xcalloc(1, sizeof(*oids));
1095         int i;
1096
1097         for (i = 0; i < negotiation_tip.nr; i++) {
1098                 const char *s = negotiation_tip.items[i].string;
1099                 int old_nr;
1100                 if (!has_glob_specials(s)) {
1101                         struct object_id oid;
1102                         if (get_oid(s, &oid))
1103                                 die("%s is not a valid object", s);
1104                         oid_array_append(oids, &oid);
1105                         continue;
1106                 }
1107                 old_nr = oids->nr;
1108                 for_each_glob_ref(add_oid, s, oids);
1109                 if (old_nr == oids->nr)
1110                         warning("Ignoring --negotiation-tip=%s because it does not match any refs",
1111                                 s);
1112         }
1113         smart_options->negotiation_tips = oids;
1114 }
1115
1116 static struct transport *prepare_transport(struct remote *remote, int deepen)
1117 {
1118         struct transport *transport;
1119         transport = transport_get(remote, NULL);
1120         transport_set_verbosity(transport, verbosity, progress);
1121         transport->family = family;
1122         if (upload_pack)
1123                 set_option(transport, TRANS_OPT_UPLOADPACK, upload_pack);
1124         if (keep)
1125                 set_option(transport, TRANS_OPT_KEEP, "yes");
1126         if (depth)
1127                 set_option(transport, TRANS_OPT_DEPTH, depth);
1128         if (deepen && deepen_since)
1129                 set_option(transport, TRANS_OPT_DEEPEN_SINCE, deepen_since);
1130         if (deepen && deepen_not.nr)
1131                 set_option(transport, TRANS_OPT_DEEPEN_NOT,
1132                            (const char *)&deepen_not);
1133         if (deepen_relative)
1134                 set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, "yes");
1135         if (update_shallow)
1136                 set_option(transport, TRANS_OPT_UPDATE_SHALLOW, "yes");
1137         if (filter_options.choice) {
1138                 set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER,
1139                            filter_options.filter_spec);
1140                 set_option(transport, TRANS_OPT_FROM_PROMISOR, "1");
1141         }
1142         if (negotiation_tip.nr) {
1143                 if (transport->smart_options)
1144                         add_negotiation_tips(transport->smart_options);
1145                 else
1146                         warning("Ignoring --negotiation-tip because the protocol does not support it.");
1147         }
1148         return transport;
1149 }
1150
1151 static void backfill_tags(struct transport *transport, struct ref *ref_map)
1152 {
1153         int cannot_reuse;
1154
1155         /*
1156          * Once we have set TRANS_OPT_DEEPEN_SINCE, we can't unset it
1157          * when remote helper is used (setting it to an empty string
1158          * is not unsetting). We could extend the remote helper
1159          * protocol for that, but for now, just force a new connection
1160          * without deepen-since. Similar story for deepen-not.
1161          */
1162         cannot_reuse = transport->cannot_reuse ||
1163                 deepen_since || deepen_not.nr;
1164         if (cannot_reuse) {
1165                 gsecondary = prepare_transport(transport->remote, 0);
1166                 transport = gsecondary;
1167         }
1168
1169         transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
1170         transport_set_option(transport, TRANS_OPT_DEPTH, "0");
1171         transport_set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, NULL);
1172         if (!fetch_refs(transport, ref_map))
1173                 consume_refs(transport, ref_map);
1174
1175         if (gsecondary) {
1176                 transport_disconnect(gsecondary);
1177                 gsecondary = NULL;
1178         }
1179 }
1180
1181 static int do_fetch(struct transport *transport,
1182                     struct refspec *rs)
1183 {
1184         struct ref *ref_map;
1185         int autotags = (transport->remote->fetch_tags == 1);
1186         int retcode = 0;
1187         const struct ref *remote_refs;
1188         struct argv_array ref_prefixes = ARGV_ARRAY_INIT;
1189         int must_list_refs = 1;
1190
1191         if (tags == TAGS_DEFAULT) {
1192                 if (transport->remote->fetch_tags == 2)
1193                         tags = TAGS_SET;
1194                 if (transport->remote->fetch_tags == -1)
1195                         tags = TAGS_UNSET;
1196         }
1197
1198         /* if not appending, truncate FETCH_HEAD */
1199         if (!append && !dry_run) {
1200                 retcode = truncate_fetch_head();
1201                 if (retcode)
1202                         goto cleanup;
1203         }
1204
1205         if (rs->nr) {
1206                 int i;
1207
1208                 refspec_ref_prefixes(rs, &ref_prefixes);
1209
1210                 /*
1211                  * We can avoid listing refs if all of them are exact
1212                  * OIDs
1213                  */
1214                 must_list_refs = 0;
1215                 for (i = 0; i < rs->nr; i++) {
1216                         if (!rs->items[i].exact_sha1) {
1217                                 must_list_refs = 1;
1218                                 break;
1219                         }
1220                 }
1221         } else if (transport->remote && transport->remote->fetch.nr)
1222                 refspec_ref_prefixes(&transport->remote->fetch, &ref_prefixes);
1223
1224         if (tags == TAGS_SET || tags == TAGS_DEFAULT) {
1225                 must_list_refs = 1;
1226                 if (ref_prefixes.argc)
1227                         argv_array_push(&ref_prefixes, "refs/tags/");
1228         }
1229
1230         if (must_list_refs)
1231                 remote_refs = transport_get_remote_refs(transport, &ref_prefixes);
1232         else
1233                 remote_refs = NULL;
1234
1235         argv_array_clear(&ref_prefixes);
1236
1237         ref_map = get_ref_map(transport->remote, remote_refs, rs,
1238                               tags, &autotags);
1239         if (!update_head_ok)
1240                 check_not_current_branch(ref_map);
1241
1242         if (tags == TAGS_DEFAULT && autotags)
1243                 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
1244         if (prune) {
1245                 /*
1246                  * We only prune based on refspecs specified
1247                  * explicitly (via command line or configuration); we
1248                  * don't care whether --tags was specified.
1249                  */
1250                 if (rs->nr) {
1251                         prune_refs(rs, ref_map, transport->url);
1252                 } else {
1253                         prune_refs(&transport->remote->fetch,
1254                                    ref_map,
1255                                    transport->url);
1256                 }
1257         }
1258         if (fetch_refs(transport, ref_map) || consume_refs(transport, ref_map)) {
1259                 free_refs(ref_map);
1260                 retcode = 1;
1261                 goto cleanup;
1262         }
1263         free_refs(ref_map);
1264
1265         /* if neither --no-tags nor --tags was specified, do automated tag
1266          * following ... */
1267         if (tags == TAGS_DEFAULT && autotags) {
1268                 struct ref **tail = &ref_map;
1269                 ref_map = NULL;
1270                 find_non_local_tags(remote_refs, &ref_map, &tail);
1271                 if (ref_map)
1272                         backfill_tags(transport, ref_map);
1273                 free_refs(ref_map);
1274         }
1275
1276  cleanup:
1277         return retcode;
1278 }
1279
1280 static int get_one_remote_for_fetch(struct remote *remote, void *priv)
1281 {
1282         struct string_list *list = priv;
1283         if (!remote->skip_default_update)
1284                 string_list_append(list, remote->name);
1285         return 0;
1286 }
1287
1288 struct remote_group_data {
1289         const char *name;
1290         struct string_list *list;
1291 };
1292
1293 static int get_remote_group(const char *key, const char *value, void *priv)
1294 {
1295         struct remote_group_data *g = priv;
1296
1297         if (skip_prefix(key, "remotes.", &key) && !strcmp(key, g->name)) {
1298                 /* split list by white space */
1299                 while (*value) {
1300                         size_t wordlen = strcspn(value, " \t\n");
1301
1302                         if (wordlen >= 1)
1303                                 string_list_append_nodup(g->list,
1304                                                    xstrndup(value, wordlen));
1305                         value += wordlen + (value[wordlen] != '\0');
1306                 }
1307         }
1308
1309         return 0;
1310 }
1311
1312 static int add_remote_or_group(const char *name, struct string_list *list)
1313 {
1314         int prev_nr = list->nr;
1315         struct remote_group_data g;
1316         g.name = name; g.list = list;
1317
1318         git_config(get_remote_group, &g);
1319         if (list->nr == prev_nr) {
1320                 struct remote *remote = remote_get(name);
1321                 if (!remote_is_configured(remote, 0))
1322                         return 0;
1323                 string_list_append(list, remote->name);
1324         }
1325         return 1;
1326 }
1327
1328 static void add_options_to_argv(struct argv_array *argv)
1329 {
1330         if (dry_run)
1331                 argv_array_push(argv, "--dry-run");
1332         if (prune != -1)
1333                 argv_array_push(argv, prune ? "--prune" : "--no-prune");
1334         if (prune_tags != -1)
1335                 argv_array_push(argv, prune_tags ? "--prune-tags" : "--no-prune-tags");
1336         if (update_head_ok)
1337                 argv_array_push(argv, "--update-head-ok");
1338         if (force)
1339                 argv_array_push(argv, "--force");
1340         if (keep)
1341                 argv_array_push(argv, "--keep");
1342         if (recurse_submodules == RECURSE_SUBMODULES_ON)
1343                 argv_array_push(argv, "--recurse-submodules");
1344         else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND)
1345                 argv_array_push(argv, "--recurse-submodules=on-demand");
1346         if (tags == TAGS_SET)
1347                 argv_array_push(argv, "--tags");
1348         else if (tags == TAGS_UNSET)
1349                 argv_array_push(argv, "--no-tags");
1350         if (verbosity >= 2)
1351                 argv_array_push(argv, "-v");
1352         if (verbosity >= 1)
1353                 argv_array_push(argv, "-v");
1354         else if (verbosity < 0)
1355                 argv_array_push(argv, "-q");
1356
1357 }
1358
1359 static int fetch_multiple(struct string_list *list)
1360 {
1361         int i, result = 0;
1362         struct argv_array argv = ARGV_ARRAY_INIT;
1363
1364         if (!append && !dry_run) {
1365                 int errcode = truncate_fetch_head();
1366                 if (errcode)
1367                         return errcode;
1368         }
1369
1370         argv_array_pushl(&argv, "fetch", "--append", NULL);
1371         add_options_to_argv(&argv);
1372
1373         for (i = 0; i < list->nr; i++) {
1374                 const char *name = list->items[i].string;
1375                 argv_array_push(&argv, name);
1376                 if (verbosity >= 0)
1377                         printf(_("Fetching %s\n"), name);
1378                 if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
1379                         error(_("Could not fetch %s"), name);
1380                         result = 1;
1381                 }
1382                 argv_array_pop(&argv);
1383         }
1384
1385         argv_array_clear(&argv);
1386         return result;
1387 }
1388
1389 /*
1390  * Fetching from the promisor remote should use the given filter-spec
1391  * or inherit the default filter-spec from the config.
1392  */
1393 static inline void fetch_one_setup_partial(struct remote *remote)
1394 {
1395         /*
1396          * Explicit --no-filter argument overrides everything, regardless
1397          * of any prior partial clones and fetches.
1398          */
1399         if (filter_options.no_filter)
1400                 return;
1401
1402         /*
1403          * If no prior partial clone/fetch and the current fetch DID NOT
1404          * request a partial-fetch, do a normal fetch.
1405          */
1406         if (!repository_format_partial_clone && !filter_options.choice)
1407                 return;
1408
1409         /*
1410          * If this is the FIRST partial-fetch request, we enable partial
1411          * on this repo and remember the given filter-spec as the default
1412          * for subsequent fetches to this remote.
1413          */
1414         if (!repository_format_partial_clone && filter_options.choice) {
1415                 partial_clone_register(remote->name, &filter_options);
1416                 return;
1417         }
1418
1419         /*
1420          * We are currently limited to only ONE promisor remote and only
1421          * allow partial-fetches from the promisor remote.
1422          */
1423         if (strcmp(remote->name, repository_format_partial_clone)) {
1424                 if (filter_options.choice)
1425                         die(_("--filter can only be used with the remote configured in core.partialClone"));
1426                 return;
1427         }
1428
1429         /*
1430          * Do a partial-fetch from the promisor remote using either the
1431          * explicitly given filter-spec or inherit the filter-spec from
1432          * the config.
1433          */
1434         if (!filter_options.choice)
1435                 partial_clone_get_default_filter_spec(&filter_options);
1436         return;
1437 }
1438
1439 static int fetch_one(struct remote *remote, int argc, const char **argv, int prune_tags_ok)
1440 {
1441         struct refspec rs = REFSPEC_INIT_FETCH;
1442         int i;
1443         int exit_code;
1444         int maybe_prune_tags;
1445         int remote_via_config = remote_is_configured(remote, 0);
1446
1447         if (!remote)
1448                 die(_("No remote repository specified.  Please, specify either a URL or a\n"
1449                     "remote name from which new revisions should be fetched."));
1450
1451         gtransport = prepare_transport(remote, 1);
1452
1453         if (prune < 0) {
1454                 /* no command line request */
1455                 if (0 <= remote->prune)
1456                         prune = remote->prune;
1457                 else if (0 <= fetch_prune_config)
1458                         prune = fetch_prune_config;
1459                 else
1460                         prune = PRUNE_BY_DEFAULT;
1461         }
1462
1463         if (prune_tags < 0) {
1464                 /* no command line request */
1465                 if (0 <= remote->prune_tags)
1466                         prune_tags = remote->prune_tags;
1467                 else if (0 <= fetch_prune_tags_config)
1468                         prune_tags = fetch_prune_tags_config;
1469                 else
1470                         prune_tags = PRUNE_TAGS_BY_DEFAULT;
1471         }
1472
1473         maybe_prune_tags = prune_tags_ok && prune_tags;
1474         if (maybe_prune_tags && remote_via_config)
1475                 refspec_append(&remote->fetch, TAG_REFSPEC);
1476
1477         if (maybe_prune_tags && (argc || !remote_via_config))
1478                 refspec_append(&rs, TAG_REFSPEC);
1479
1480         for (i = 0; i < argc; i++) {
1481                 if (!strcmp(argv[i], "tag")) {
1482                         char *tag;
1483                         i++;
1484                         if (i >= argc)
1485                                 die(_("You need to specify a tag name."));
1486
1487                         tag = xstrfmt("refs/tags/%s:refs/tags/%s",
1488                                       argv[i], argv[i]);
1489                         refspec_append(&rs, tag);
1490                         free(tag);
1491                 } else {
1492                         refspec_append(&rs, argv[i]);
1493                 }
1494         }
1495
1496         if (server_options.nr)
1497                 gtransport->server_options = &server_options;
1498
1499         sigchain_push_common(unlock_pack_on_signal);
1500         atexit(unlock_pack);
1501         exit_code = do_fetch(gtransport, &rs);
1502         refspec_clear(&rs);
1503         transport_disconnect(gtransport);
1504         gtransport = NULL;
1505         return exit_code;
1506 }
1507
1508 int cmd_fetch(int argc, const char **argv, const char *prefix)
1509 {
1510         int i;
1511         struct string_list list = STRING_LIST_INIT_DUP;
1512         struct remote *remote = NULL;
1513         int result = 0;
1514         int prune_tags_ok = 1;
1515         struct argv_array argv_gc_auto = ARGV_ARRAY_INIT;
1516
1517         packet_trace_identity("fetch");
1518
1519         fetch_if_missing = 0;
1520
1521         /* Record the command line for the reflog */
1522         strbuf_addstr(&default_rla, "fetch");
1523         for (i = 1; i < argc; i++)
1524                 strbuf_addf(&default_rla, " %s", argv[i]);
1525
1526         fetch_config_from_gitmodules(&max_children, &recurse_submodules);
1527         git_config(git_fetch_config, NULL);
1528
1529         argc = parse_options(argc, argv, prefix,
1530                              builtin_fetch_options, builtin_fetch_usage, 0);
1531
1532         if (deepen_relative) {
1533                 if (deepen_relative < 0)
1534                         die(_("Negative depth in --deepen is not supported"));
1535                 if (depth)
1536                         die(_("--deepen and --depth are mutually exclusive"));
1537                 depth = xstrfmt("%d", deepen_relative);
1538         }
1539         if (unshallow) {
1540                 if (depth)
1541                         die(_("--depth and --unshallow cannot be used together"));
1542                 else if (!is_repository_shallow(the_repository))
1543                         die(_("--unshallow on a complete repository does not make sense"));
1544                 else
1545                         depth = xstrfmt("%d", INFINITE_DEPTH);
1546         }
1547
1548         /* no need to be strict, transport_set_option() will validate it again */
1549         if (depth && atoi(depth) < 1)
1550                 die(_("depth %s is not a positive number"), depth);
1551         if (depth || deepen_since || deepen_not.nr)
1552                 deepen = 1;
1553
1554         if (filter_options.choice && !repository_format_partial_clone)
1555                 die("--filter can only be used when extensions.partialClone is set");
1556
1557         if (all) {
1558                 if (argc == 1)
1559                         die(_("fetch --all does not take a repository argument"));
1560                 else if (argc > 1)
1561                         die(_("fetch --all does not make sense with refspecs"));
1562                 (void) for_each_remote(get_one_remote_for_fetch, &list);
1563         } else if (argc == 0) {
1564                 /* No arguments -- use default remote */
1565                 remote = remote_get(NULL);
1566         } else if (multiple) {
1567                 /* All arguments are assumed to be remotes or groups */
1568                 for (i = 0; i < argc; i++)
1569                         if (!add_remote_or_group(argv[i], &list))
1570                                 die(_("No such remote or remote group: %s"), argv[i]);
1571         } else {
1572                 /* Single remote or group */
1573                 (void) add_remote_or_group(argv[0], &list);
1574                 if (list.nr > 1) {
1575                         /* More than one remote */
1576                         if (argc > 1)
1577                                 die(_("Fetching a group and specifying refspecs does not make sense"));
1578                 } else {
1579                         /* Zero or one remotes */
1580                         remote = remote_get(argv[0]);
1581                         prune_tags_ok = (argc == 1);
1582                         argc--;
1583                         argv++;
1584                 }
1585         }
1586
1587         if (remote) {
1588                 if (filter_options.choice || repository_format_partial_clone)
1589                         fetch_one_setup_partial(remote);
1590                 result = fetch_one(remote, argc, argv, prune_tags_ok);
1591         } else {
1592                 if (filter_options.choice)
1593                         die(_("--filter can only be used with the remote configured in core.partialClone"));
1594                 /* TODO should this also die if we have a previous partial-clone? */
1595                 result = fetch_multiple(&list);
1596         }
1597
1598         if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
1599                 struct argv_array options = ARGV_ARRAY_INIT;
1600
1601                 add_options_to_argv(&options);
1602                 result = fetch_populated_submodules(the_repository,
1603                                                     &options,
1604                                                     submodule_prefix,
1605                                                     recurse_submodules,
1606                                                     recurse_submodules_default,
1607                                                     verbosity < 0,
1608                                                     max_children);
1609                 argv_array_clear(&options);
1610         }
1611
1612         string_list_clear(&list, 0);
1613
1614         close_all_packs(the_repository->objects);
1615
1616         argv_array_pushl(&argv_gc_auto, "gc", "--auto", NULL);
1617         if (verbosity < 0)
1618                 argv_array_push(&argv_gc_auto, "--quiet");
1619         run_command_v_opt(argv_gc_auto.argv, RUN_GIT_CMD);
1620         argv_array_clear(&argv_gc_auto);
1621
1622         return result;
1623 }