Merge branch 'ah/show-ref-usage-string'
[git] / builtin / fetch.c
1 /*
2  * "git fetch"
3  */
4 #include "cache.h"
5 #include "refs.h"
6 #include "commit.h"
7 #include "builtin.h"
8 #include "string-list.h"
9 #include "remote.h"
10 #include "transport.h"
11 #include "run-command.h"
12 #include "parse-options.h"
13 #include "sigchain.h"
14 #include "submodule-config.h"
15 #include "submodule.h"
16 #include "connected.h"
17 #include "argv-array.h"
18
19 static const char * const builtin_fetch_usage[] = {
20         N_("git fetch [<options>] [<repository> [<refspec>...]]"),
21         N_("git fetch [<options>] <group>"),
22         N_("git fetch --multiple [<options>] [(<repository> | <group>)...]"),
23         N_("git fetch --all [<options>]"),
24         NULL
25 };
26
27 enum {
28         TAGS_UNSET = 0,
29         TAGS_DEFAULT = 1,
30         TAGS_SET = 2
31 };
32
33 static int fetch_prune_config = -1; /* unspecified */
34 static int prune = -1; /* unspecified */
35 #define PRUNE_BY_DEFAULT 0 /* do we prune by default? */
36
37 static int all, append, dry_run, force, keep, multiple, update_head_ok, verbosity;
38 static int progress = -1, recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
39 static int tags = TAGS_DEFAULT, unshallow, update_shallow;
40 static const char *depth;
41 static const char *upload_pack;
42 static struct strbuf default_rla = STRBUF_INIT;
43 static struct transport *gtransport;
44 static struct transport *gsecondary;
45 static const char *submodule_prefix = "";
46 static const char *recurse_submodules_default;
47 static int shown_url = 0;
48 static int refmap_alloc, refmap_nr;
49 static const char **refmap_array;
50
51 static int option_parse_recurse_submodules(const struct option *opt,
52                                    const char *arg, int unset)
53 {
54         if (unset) {
55                 recurse_submodules = RECURSE_SUBMODULES_OFF;
56         } else {
57                 if (arg)
58                         recurse_submodules = parse_fetch_recurse_submodules_arg(opt->long_name, arg);
59                 else
60                         recurse_submodules = RECURSE_SUBMODULES_ON;
61         }
62         return 0;
63 }
64
65 static int git_fetch_config(const char *k, const char *v, void *cb)
66 {
67         if (!strcmp(k, "fetch.prune")) {
68                 fetch_prune_config = git_config_bool(k, v);
69                 return 0;
70         }
71         return git_default_config(k, v, cb);
72 }
73
74 static int parse_refmap_arg(const struct option *opt, const char *arg, int unset)
75 {
76         ALLOC_GROW(refmap_array, refmap_nr + 1, refmap_alloc);
77
78         /*
79          * "git fetch --refmap='' origin foo"
80          * can be used to tell the command not to store anywhere
81          */
82         if (*arg)
83                 refmap_array[refmap_nr++] = arg;
84         return 0;
85 }
86
87 static struct option builtin_fetch_options[] = {
88         OPT__VERBOSITY(&verbosity),
89         OPT_BOOL(0, "all", &all,
90                  N_("fetch from all remotes")),
91         OPT_BOOL('a', "append", &append,
92                  N_("append to .git/FETCH_HEAD instead of overwriting")),
93         OPT_STRING(0, "upload-pack", &upload_pack, N_("path"),
94                    N_("path to upload pack on remote end")),
95         OPT__FORCE(&force, N_("force overwrite of local branch")),
96         OPT_BOOL('m', "multiple", &multiple,
97                  N_("fetch from multiple remotes")),
98         OPT_SET_INT('t', "tags", &tags,
99                     N_("fetch all tags and associated objects"), TAGS_SET),
100         OPT_SET_INT('n', NULL, &tags,
101                     N_("do not fetch all tags (--no-tags)"), TAGS_UNSET),
102         OPT_BOOL('p', "prune", &prune,
103                  N_("prune remote-tracking branches no longer on remote")),
104         { OPTION_CALLBACK, 0, "recurse-submodules", NULL, N_("on-demand"),
105                     N_("control recursive fetching of submodules"),
106                     PARSE_OPT_OPTARG, option_parse_recurse_submodules },
107         OPT_BOOL(0, "dry-run", &dry_run,
108                  N_("dry run")),
109         OPT_BOOL('k', "keep", &keep, N_("keep downloaded pack")),
110         OPT_BOOL('u', "update-head-ok", &update_head_ok,
111                     N_("allow updating of HEAD ref")),
112         OPT_BOOL(0, "progress", &progress, N_("force progress reporting")),
113         OPT_STRING(0, "depth", &depth, N_("depth"),
114                    N_("deepen history of shallow clone")),
115         { OPTION_SET_INT, 0, "unshallow", &unshallow, NULL,
116                    N_("convert to a complete repository"),
117                    PARSE_OPT_NONEG | PARSE_OPT_NOARG, NULL, 1 },
118         { OPTION_STRING, 0, "submodule-prefix", &submodule_prefix, N_("dir"),
119                    N_("prepend this to submodule path output"), PARSE_OPT_HIDDEN },
120         { OPTION_STRING, 0, "recurse-submodules-default",
121                    &recurse_submodules_default, NULL,
122                    N_("default mode for recursion"), PARSE_OPT_HIDDEN },
123         OPT_BOOL(0, "update-shallow", &update_shallow,
124                  N_("accept refs that update .git/shallow")),
125         { OPTION_CALLBACK, 0, "refmap", NULL, N_("refmap"),
126           N_("specify fetch refmap"), PARSE_OPT_NONEG, parse_refmap_arg },
127         OPT_END()
128 };
129
130 static void unlock_pack(void)
131 {
132         if (gtransport)
133                 transport_unlock_pack(gtransport);
134         if (gsecondary)
135                 transport_unlock_pack(gsecondary);
136 }
137
138 static void unlock_pack_on_signal(int signo)
139 {
140         unlock_pack();
141         sigchain_pop(signo);
142         raise(signo);
143 }
144
145 static void add_merge_config(struct ref **head,
146                            const struct ref *remote_refs,
147                            struct branch *branch,
148                            struct ref ***tail)
149 {
150         int i;
151
152         for (i = 0; i < branch->merge_nr; i++) {
153                 struct ref *rm, **old_tail = *tail;
154                 struct refspec refspec;
155
156                 for (rm = *head; rm; rm = rm->next) {
157                         if (branch_merge_matches(branch, i, rm->name)) {
158                                 rm->fetch_head_status = FETCH_HEAD_MERGE;
159                                 break;
160                         }
161                 }
162                 if (rm)
163                         continue;
164
165                 /*
166                  * Not fetched to a remote-tracking branch?  We need to fetch
167                  * it anyway to allow this branch's "branch.$name.merge"
168                  * to be honored by 'git pull', but we do not have to
169                  * fail if branch.$name.merge is misconfigured to point
170                  * at a nonexisting branch.  If we were indeed called by
171                  * 'git pull', it will notice the misconfiguration because
172                  * there is no entry in the resulting FETCH_HEAD marked
173                  * for merging.
174                  */
175                 memset(&refspec, 0, sizeof(refspec));
176                 refspec.src = branch->merge[i]->src;
177                 get_fetch_map(remote_refs, &refspec, tail, 1);
178                 for (rm = *old_tail; rm; rm = rm->next)
179                         rm->fetch_head_status = FETCH_HEAD_MERGE;
180         }
181 }
182
183 static int add_existing(const char *refname, const struct object_id *oid,
184                         int flag, void *cbdata)
185 {
186         struct string_list *list = (struct string_list *)cbdata;
187         struct string_list_item *item = string_list_insert(list, refname);
188         struct object_id *old_oid = xmalloc(sizeof(*old_oid));
189
190         oidcpy(old_oid, oid);
191         item->util = old_oid;
192         return 0;
193 }
194
195 static int will_fetch(struct ref **head, const unsigned char *sha1)
196 {
197         struct ref *rm = *head;
198         while (rm) {
199                 if (!hashcmp(rm->old_sha1, sha1))
200                         return 1;
201                 rm = rm->next;
202         }
203         return 0;
204 }
205
206 static void find_non_local_tags(struct transport *transport,
207                         struct ref **head,
208                         struct ref ***tail)
209 {
210         struct string_list existing_refs = STRING_LIST_INIT_DUP;
211         struct string_list remote_refs = STRING_LIST_INIT_NODUP;
212         const struct ref *ref;
213         struct string_list_item *item = NULL;
214
215         for_each_ref(add_existing, &existing_refs);
216         for (ref = transport_get_remote_refs(transport); ref; ref = ref->next) {
217                 if (!starts_with(ref->name, "refs/tags/"))
218                         continue;
219
220                 /*
221                  * The peeled ref always follows the matching base
222                  * ref, so if we see a peeled ref that we don't want
223                  * to fetch then we can mark the ref entry in the list
224                  * as one to ignore by setting util to NULL.
225                  */
226                 if (ends_with(ref->name, "^{}")) {
227                         if (item && !has_sha1_file(ref->old_sha1) &&
228                             !will_fetch(head, ref->old_sha1) &&
229                             !has_sha1_file(item->util) &&
230                             !will_fetch(head, item->util))
231                                 item->util = NULL;
232                         item = NULL;
233                         continue;
234                 }
235
236                 /*
237                  * If item is non-NULL here, then we previously saw a
238                  * ref not followed by a peeled reference, so we need
239                  * to check if it is a lightweight tag that we want to
240                  * fetch.
241                  */
242                 if (item && !has_sha1_file(item->util) &&
243                     !will_fetch(head, item->util))
244                         item->util = NULL;
245
246                 item = NULL;
247
248                 /* skip duplicates and refs that we already have */
249                 if (string_list_has_string(&remote_refs, ref->name) ||
250                     string_list_has_string(&existing_refs, ref->name))
251                         continue;
252
253                 item = string_list_insert(&remote_refs, ref->name);
254                 item->util = (void *)ref->old_sha1;
255         }
256         string_list_clear(&existing_refs, 1);
257
258         /*
259          * We may have a final lightweight tag that needs to be
260          * checked to see if it needs fetching.
261          */
262         if (item && !has_sha1_file(item->util) &&
263             !will_fetch(head, item->util))
264                 item->util = NULL;
265
266         /*
267          * For all the tags in the remote_refs string list,
268          * add them to the list of refs to be fetched
269          */
270         for_each_string_list_item(item, &remote_refs) {
271                 /* Unless we have already decided to ignore this item... */
272                 if (item->util)
273                 {
274                         struct ref *rm = alloc_ref(item->string);
275                         rm->peer_ref = alloc_ref(item->string);
276                         hashcpy(rm->old_sha1, item->util);
277                         **tail = rm;
278                         *tail = &rm->next;
279                 }
280         }
281
282         string_list_clear(&remote_refs, 0);
283 }
284
285 static struct ref *get_ref_map(struct transport *transport,
286                                struct refspec *refspecs, int refspec_count,
287                                int tags, int *autotags)
288 {
289         int i;
290         struct ref *rm;
291         struct ref *ref_map = NULL;
292         struct ref **tail = &ref_map;
293
294         /* opportunistically-updated references: */
295         struct ref *orefs = NULL, **oref_tail = &orefs;
296
297         const struct ref *remote_refs = transport_get_remote_refs(transport);
298
299         if (refspec_count) {
300                 struct refspec *fetch_refspec;
301                 int fetch_refspec_nr;
302
303                 for (i = 0; i < refspec_count; i++) {
304                         get_fetch_map(remote_refs, &refspecs[i], &tail, 0);
305                         if (refspecs[i].dst && refspecs[i].dst[0])
306                                 *autotags = 1;
307                 }
308                 /* Merge everything on the command line (but not --tags) */
309                 for (rm = ref_map; rm; rm = rm->next)
310                         rm->fetch_head_status = FETCH_HEAD_MERGE;
311
312                 /*
313                  * For any refs that we happen to be fetching via
314                  * command-line arguments, the destination ref might
315                  * have been missing or have been different than the
316                  * remote-tracking ref that would be derived from the
317                  * configured refspec.  In these cases, we want to
318                  * take the opportunity to update their configured
319                  * remote-tracking reference.  However, we do not want
320                  * to mention these entries in FETCH_HEAD at all, as
321                  * they would simply be duplicates of existing
322                  * entries, so we set them FETCH_HEAD_IGNORE below.
323                  *
324                  * We compute these entries now, based only on the
325                  * refspecs specified on the command line.  But we add
326                  * them to the list following the refspecs resulting
327                  * from the tags option so that one of the latter,
328                  * which has FETCH_HEAD_NOT_FOR_MERGE, is not removed
329                  * by ref_remove_duplicates() in favor of one of these
330                  * opportunistic entries with FETCH_HEAD_IGNORE.
331                  */
332                 if (refmap_array) {
333                         fetch_refspec = parse_fetch_refspec(refmap_nr, refmap_array);
334                         fetch_refspec_nr = refmap_nr;
335                 } else {
336                         fetch_refspec = transport->remote->fetch;
337                         fetch_refspec_nr = transport->remote->fetch_refspec_nr;
338                 }
339
340                 for (i = 0; i < fetch_refspec_nr; i++)
341                         get_fetch_map(ref_map, &fetch_refspec[i], &oref_tail, 1);
342
343                 if (tags == TAGS_SET)
344                         get_fetch_map(remote_refs, tag_refspec, &tail, 0);
345         } else if (refmap_array) {
346                 die("--refmap option is only meaningful with command-line refspec(s).");
347         } else {
348                 /* Use the defaults */
349                 struct remote *remote = transport->remote;
350                 struct branch *branch = branch_get(NULL);
351                 int has_merge = branch_has_merge_config(branch);
352                 if (remote &&
353                     (remote->fetch_refspec_nr ||
354                      /* Note: has_merge implies non-NULL branch->remote_name */
355                      (has_merge && !strcmp(branch->remote_name, remote->name)))) {
356                         for (i = 0; i < remote->fetch_refspec_nr; i++) {
357                                 get_fetch_map(remote_refs, &remote->fetch[i], &tail, 0);
358                                 if (remote->fetch[i].dst &&
359                                     remote->fetch[i].dst[0])
360                                         *autotags = 1;
361                                 if (!i && !has_merge && ref_map &&
362                                     !remote->fetch[0].pattern)
363                                         ref_map->fetch_head_status = FETCH_HEAD_MERGE;
364                         }
365                         /*
366                          * if the remote we're fetching from is the same
367                          * as given in branch.<name>.remote, we add the
368                          * ref given in branch.<name>.merge, too.
369                          *
370                          * Note: has_merge implies non-NULL branch->remote_name
371                          */
372                         if (has_merge &&
373                             !strcmp(branch->remote_name, remote->name))
374                                 add_merge_config(&ref_map, remote_refs, branch, &tail);
375                 } else {
376                         ref_map = get_remote_ref(remote_refs, "HEAD");
377                         if (!ref_map)
378                                 die(_("Couldn't find remote ref HEAD"));
379                         ref_map->fetch_head_status = FETCH_HEAD_MERGE;
380                         tail = &ref_map->next;
381                 }
382         }
383
384         if (tags == TAGS_SET)
385                 /* also fetch all tags */
386                 get_fetch_map(remote_refs, tag_refspec, &tail, 0);
387         else if (tags == TAGS_DEFAULT && *autotags)
388                 find_non_local_tags(transport, &ref_map, &tail);
389
390         /* Now append any refs to be updated opportunistically: */
391         *tail = orefs;
392         for (rm = orefs; rm; rm = rm->next) {
393                 rm->fetch_head_status = FETCH_HEAD_IGNORE;
394                 tail = &rm->next;
395         }
396
397         return ref_remove_duplicates(ref_map);
398 }
399
400 #define STORE_REF_ERROR_OTHER 1
401 #define STORE_REF_ERROR_DF_CONFLICT 2
402
403 static int s_update_ref(const char *action,
404                         struct ref *ref,
405                         int check_old)
406 {
407         char msg[1024];
408         char *rla = getenv("GIT_REFLOG_ACTION");
409         struct ref_transaction *transaction;
410         struct strbuf err = STRBUF_INIT;
411         int ret, df_conflict = 0;
412
413         if (dry_run)
414                 return 0;
415         if (!rla)
416                 rla = default_rla.buf;
417         snprintf(msg, sizeof(msg), "%s: %s", rla, action);
418
419         transaction = ref_transaction_begin(&err);
420         if (!transaction ||
421             ref_transaction_update(transaction, ref->name,
422                                    ref->new_sha1,
423                                    check_old ? ref->old_sha1 : NULL,
424                                    0, msg, &err))
425                 goto fail;
426
427         ret = ref_transaction_commit(transaction, &err);
428         if (ret) {
429                 df_conflict = (ret == TRANSACTION_NAME_CONFLICT);
430                 goto fail;
431         }
432
433         ref_transaction_free(transaction);
434         strbuf_release(&err);
435         return 0;
436 fail:
437         ref_transaction_free(transaction);
438         error("%s", err.buf);
439         strbuf_release(&err);
440         return df_conflict ? STORE_REF_ERROR_DF_CONFLICT
441                            : STORE_REF_ERROR_OTHER;
442 }
443
444 #define REFCOL_WIDTH  10
445
446 static int update_local_ref(struct ref *ref,
447                             const char *remote,
448                             const struct ref *remote_ref,
449                             struct strbuf *display)
450 {
451         struct commit *current = NULL, *updated;
452         enum object_type type;
453         struct branch *current_branch = branch_get(NULL);
454         const char *pretty_ref = prettify_refname(ref->name);
455
456         type = sha1_object_info(ref->new_sha1, NULL);
457         if (type < 0)
458                 die(_("object %s not found"), sha1_to_hex(ref->new_sha1));
459
460         if (!hashcmp(ref->old_sha1, ref->new_sha1)) {
461                 if (verbosity > 0)
462                         strbuf_addf(display, "= %-*s %-*s -> %s",
463                                     TRANSPORT_SUMMARY(_("[up to date]")),
464                                     REFCOL_WIDTH, remote, pretty_ref);
465                 return 0;
466         }
467
468         if (current_branch &&
469             !strcmp(ref->name, current_branch->name) &&
470             !(update_head_ok || is_bare_repository()) &&
471             !is_null_sha1(ref->old_sha1)) {
472                 /*
473                  * If this is the head, and it's not okay to update
474                  * the head, and the old value of the head isn't empty...
475                  */
476                 strbuf_addf(display,
477                             _("! %-*s %-*s -> %s  (can't fetch in current branch)"),
478                             TRANSPORT_SUMMARY(_("[rejected]")),
479                             REFCOL_WIDTH, remote, pretty_ref);
480                 return 1;
481         }
482
483         if (!is_null_sha1(ref->old_sha1) &&
484             starts_with(ref->name, "refs/tags/")) {
485                 int r;
486                 r = s_update_ref("updating tag", ref, 0);
487                 strbuf_addf(display, "%c %-*s %-*s -> %s%s",
488                             r ? '!' : '-',
489                             TRANSPORT_SUMMARY(_("[tag update]")),
490                             REFCOL_WIDTH, remote, pretty_ref,
491                             r ? _("  (unable to update local ref)") : "");
492                 return r;
493         }
494
495         current = lookup_commit_reference_gently(ref->old_sha1, 1);
496         updated = lookup_commit_reference_gently(ref->new_sha1, 1);
497         if (!current || !updated) {
498                 const char *msg;
499                 const char *what;
500                 int r;
501                 /*
502                  * Nicely describe the new ref we're fetching.
503                  * Base this on the remote's ref name, as it's
504                  * more likely to follow a standard layout.
505                  */
506                 const char *name = remote_ref ? remote_ref->name : "";
507                 if (starts_with(name, "refs/tags/")) {
508                         msg = "storing tag";
509                         what = _("[new tag]");
510                 } else if (starts_with(name, "refs/heads/")) {
511                         msg = "storing head";
512                         what = _("[new branch]");
513                 } else {
514                         msg = "storing ref";
515                         what = _("[new ref]");
516                 }
517
518                 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
519                     (recurse_submodules != RECURSE_SUBMODULES_ON))
520                         check_for_new_submodule_commits(ref->new_sha1);
521                 r = s_update_ref(msg, ref, 0);
522                 strbuf_addf(display, "%c %-*s %-*s -> %s%s",
523                             r ? '!' : '*',
524                             TRANSPORT_SUMMARY(what),
525                             REFCOL_WIDTH, remote, pretty_ref,
526                             r ? _("  (unable to update local ref)") : "");
527                 return r;
528         }
529
530         if (in_merge_bases(current, updated)) {
531                 char quickref[83];
532                 int r;
533                 strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV));
534                 strcat(quickref, "..");
535                 strcat(quickref, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV));
536                 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
537                     (recurse_submodules != RECURSE_SUBMODULES_ON))
538                         check_for_new_submodule_commits(ref->new_sha1);
539                 r = s_update_ref("fast-forward", ref, 1);
540                 strbuf_addf(display, "%c %-*s %-*s -> %s%s",
541                             r ? '!' : ' ',
542                             TRANSPORT_SUMMARY_WIDTH, quickref,
543                             REFCOL_WIDTH, remote, pretty_ref,
544                             r ? _("  (unable to update local ref)") : "");
545                 return r;
546         } else if (force || ref->force) {
547                 char quickref[84];
548                 int r;
549                 strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV));
550                 strcat(quickref, "...");
551                 strcat(quickref, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV));
552                 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
553                     (recurse_submodules != RECURSE_SUBMODULES_ON))
554                         check_for_new_submodule_commits(ref->new_sha1);
555                 r = s_update_ref("forced-update", ref, 1);
556                 strbuf_addf(display, "%c %-*s %-*s -> %s  (%s)",
557                             r ? '!' : '+',
558                             TRANSPORT_SUMMARY_WIDTH, quickref,
559                             REFCOL_WIDTH, remote, pretty_ref,
560                             r ? _("unable to update local ref") : _("forced update"));
561                 return r;
562         } else {
563                 strbuf_addf(display, "! %-*s %-*s -> %s  %s",
564                             TRANSPORT_SUMMARY(_("[rejected]")),
565                             REFCOL_WIDTH, remote, pretty_ref,
566                             _("(non-fast-forward)"));
567                 return 1;
568         }
569 }
570
571 static int iterate_ref_map(void *cb_data, unsigned char sha1[20])
572 {
573         struct ref **rm = cb_data;
574         struct ref *ref = *rm;
575
576         while (ref && ref->status == REF_STATUS_REJECT_SHALLOW)
577                 ref = ref->next;
578         if (!ref)
579                 return -1; /* end of the list */
580         *rm = ref->next;
581         hashcpy(sha1, ref->old_sha1);
582         return 0;
583 }
584
585 static int store_updated_refs(const char *raw_url, const char *remote_name,
586                 struct ref *ref_map)
587 {
588         FILE *fp;
589         struct commit *commit;
590         int url_len, i, rc = 0;
591         struct strbuf note = STRBUF_INIT;
592         const char *what, *kind;
593         struct ref *rm;
594         char *url;
595         const char *filename = dry_run ? "/dev/null" : git_path_fetch_head();
596         int want_status;
597
598         fp = fopen(filename, "a");
599         if (!fp)
600                 return error(_("cannot open %s: %s\n"), filename, strerror(errno));
601
602         if (raw_url)
603                 url = transport_anonymize_url(raw_url);
604         else
605                 url = xstrdup("foreign");
606
607         rm = ref_map;
608         if (check_everything_connected(iterate_ref_map, 0, &rm)) {
609                 rc = error(_("%s did not send all necessary objects\n"), url);
610                 goto abort;
611         }
612
613         /*
614          * We do a pass for each fetch_head_status type in their enum order, so
615          * merged entries are written before not-for-merge. That lets readers
616          * use FETCH_HEAD as a refname to refer to the ref to be merged.
617          */
618         for (want_status = FETCH_HEAD_MERGE;
619              want_status <= FETCH_HEAD_IGNORE;
620              want_status++) {
621                 for (rm = ref_map; rm; rm = rm->next) {
622                         struct ref *ref = NULL;
623                         const char *merge_status_marker = "";
624
625                         if (rm->status == REF_STATUS_REJECT_SHALLOW) {
626                                 if (want_status == FETCH_HEAD_MERGE)
627                                         warning(_("reject %s because shallow roots are not allowed to be updated"),
628                                                 rm->peer_ref ? rm->peer_ref->name : rm->name);
629                                 continue;
630                         }
631
632                         commit = lookup_commit_reference_gently(rm->old_sha1, 1);
633                         if (!commit)
634                                 rm->fetch_head_status = FETCH_HEAD_NOT_FOR_MERGE;
635
636                         if (rm->fetch_head_status != want_status)
637                                 continue;
638
639                         if (rm->peer_ref) {
640                                 ref = xcalloc(1, sizeof(*ref) + strlen(rm->peer_ref->name) + 1);
641                                 strcpy(ref->name, rm->peer_ref->name);
642                                 hashcpy(ref->old_sha1, rm->peer_ref->old_sha1);
643                                 hashcpy(ref->new_sha1, rm->old_sha1);
644                                 ref->force = rm->peer_ref->force;
645                         }
646
647
648                         if (!strcmp(rm->name, "HEAD")) {
649                                 kind = "";
650                                 what = "";
651                         }
652                         else if (starts_with(rm->name, "refs/heads/")) {
653                                 kind = "branch";
654                                 what = rm->name + 11;
655                         }
656                         else if (starts_with(rm->name, "refs/tags/")) {
657                                 kind = "tag";
658                                 what = rm->name + 10;
659                         }
660                         else if (starts_with(rm->name, "refs/remotes/")) {
661                                 kind = "remote-tracking branch";
662                                 what = rm->name + 13;
663                         }
664                         else {
665                                 kind = "";
666                                 what = rm->name;
667                         }
668
669                         url_len = strlen(url);
670                         for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
671                                 ;
672                         url_len = i + 1;
673                         if (4 < i && !strncmp(".git", url + i - 3, 4))
674                                 url_len = i - 3;
675
676                         strbuf_reset(&note);
677                         if (*what) {
678                                 if (*kind)
679                                         strbuf_addf(&note, "%s ", kind);
680                                 strbuf_addf(&note, "'%s' of ", what);
681                         }
682                         switch (rm->fetch_head_status) {
683                         case FETCH_HEAD_NOT_FOR_MERGE:
684                                 merge_status_marker = "not-for-merge";
685                                 /* fall-through */
686                         case FETCH_HEAD_MERGE:
687                                 fprintf(fp, "%s\t%s\t%s",
688                                         sha1_to_hex(rm->old_sha1),
689                                         merge_status_marker,
690                                         note.buf);
691                                 for (i = 0; i < url_len; ++i)
692                                         if ('\n' == url[i])
693                                                 fputs("\\n", fp);
694                                         else
695                                                 fputc(url[i], fp);
696                                 fputc('\n', fp);
697                                 break;
698                         default:
699                                 /* do not write anything to FETCH_HEAD */
700                                 break;
701                         }
702
703                         strbuf_reset(&note);
704                         if (ref) {
705                                 rc |= update_local_ref(ref, what, rm, &note);
706                                 free(ref);
707                         } else
708                                 strbuf_addf(&note, "* %-*s %-*s -> FETCH_HEAD",
709                                             TRANSPORT_SUMMARY_WIDTH,
710                                             *kind ? kind : "branch",
711                                             REFCOL_WIDTH,
712                                             *what ? what : "HEAD");
713                         if (note.len) {
714                                 if (verbosity >= 0 && !shown_url) {
715                                         fprintf(stderr, _("From %.*s\n"),
716                                                         url_len, url);
717                                         shown_url = 1;
718                                 }
719                                 if (verbosity >= 0)
720                                         fprintf(stderr, " %s\n", note.buf);
721                         }
722                 }
723         }
724
725         if (rc & STORE_REF_ERROR_DF_CONFLICT)
726                 error(_("some local refs could not be updated; try running\n"
727                       " 'git remote prune %s' to remove any old, conflicting "
728                       "branches"), remote_name);
729
730  abort:
731         strbuf_release(&note);
732         free(url);
733         fclose(fp);
734         return rc;
735 }
736
737 /*
738  * We would want to bypass the object transfer altogether if
739  * everything we are going to fetch already exists and is connected
740  * locally.
741  */
742 static int quickfetch(struct ref *ref_map)
743 {
744         struct ref *rm = ref_map;
745
746         /*
747          * If we are deepening a shallow clone we already have these
748          * objects reachable.  Running rev-list here will return with
749          * a good (0) exit status and we'll bypass the fetch that we
750          * really need to perform.  Claiming failure now will ensure
751          * we perform the network exchange to deepen our history.
752          */
753         if (depth)
754                 return -1;
755         return check_everything_connected(iterate_ref_map, 1, &rm);
756 }
757
758 static int fetch_refs(struct transport *transport, struct ref *ref_map)
759 {
760         int ret = quickfetch(ref_map);
761         if (ret)
762                 ret = transport_fetch_refs(transport, ref_map);
763         if (!ret)
764                 ret |= store_updated_refs(transport->url,
765                                 transport->remote->name,
766                                 ref_map);
767         transport_unlock_pack(transport);
768         return ret;
769 }
770
771 static int prune_refs(struct refspec *refs, int ref_count, struct ref *ref_map,
772                 const char *raw_url)
773 {
774         int url_len, i, result = 0;
775         struct ref *ref, *stale_refs = get_stale_heads(refs, ref_count, ref_map);
776         char *url;
777         const char *dangling_msg = dry_run
778                 ? _("   (%s will become dangling)")
779                 : _("   (%s has become dangling)");
780
781         if (raw_url)
782                 url = transport_anonymize_url(raw_url);
783         else
784                 url = xstrdup("foreign");
785
786         url_len = strlen(url);
787         for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
788                 ;
789
790         url_len = i + 1;
791         if (4 < i && !strncmp(".git", url + i - 3, 4))
792                 url_len = i - 3;
793
794         if (!dry_run) {
795                 struct string_list refnames = STRING_LIST_INIT_NODUP;
796
797                 for (ref = stale_refs; ref; ref = ref->next)
798                         string_list_append(&refnames, ref->name);
799
800                 result = delete_refs(&refnames);
801                 string_list_clear(&refnames, 0);
802         }
803
804         if (verbosity >= 0) {
805                 for (ref = stale_refs; ref; ref = ref->next) {
806                         if (!shown_url) {
807                                 fprintf(stderr, _("From %.*s\n"), url_len, url);
808                                 shown_url = 1;
809                         }
810                         fprintf(stderr, " x %-*s %-*s -> %s\n",
811                                 TRANSPORT_SUMMARY(_("[deleted]")),
812                                 REFCOL_WIDTH, _("(none)"), prettify_refname(ref->name));
813                         warn_dangling_symref(stderr, dangling_msg, ref->name);
814                 }
815         }
816
817         free(url);
818         free_refs(stale_refs);
819         return result;
820 }
821
822 static void check_not_current_branch(struct ref *ref_map)
823 {
824         struct branch *current_branch = branch_get(NULL);
825
826         if (is_bare_repository() || !current_branch)
827                 return;
828
829         for (; ref_map; ref_map = ref_map->next)
830                 if (ref_map->peer_ref && !strcmp(current_branch->refname,
831                                         ref_map->peer_ref->name))
832                         die(_("Refusing to fetch into current branch %s "
833                             "of non-bare repository"), current_branch->refname);
834 }
835
836 static int truncate_fetch_head(void)
837 {
838         const char *filename = git_path_fetch_head();
839         FILE *fp = fopen(filename, "w");
840
841         if (!fp)
842                 return error(_("cannot open %s: %s\n"), filename, strerror(errno));
843         fclose(fp);
844         return 0;
845 }
846
847 static void set_option(struct transport *transport, const char *name, const char *value)
848 {
849         int r = transport_set_option(transport, name, value);
850         if (r < 0)
851                 die(_("Option \"%s\" value \"%s\" is not valid for %s"),
852                     name, value, transport->url);
853         if (r > 0)
854                 warning(_("Option \"%s\" is ignored for %s\n"),
855                         name, transport->url);
856 }
857
858 static struct transport *prepare_transport(struct remote *remote)
859 {
860         struct transport *transport;
861         transport = transport_get(remote, NULL);
862         transport_set_verbosity(transport, verbosity, progress);
863         if (upload_pack)
864                 set_option(transport, TRANS_OPT_UPLOADPACK, upload_pack);
865         if (keep)
866                 set_option(transport, TRANS_OPT_KEEP, "yes");
867         if (depth)
868                 set_option(transport, TRANS_OPT_DEPTH, depth);
869         if (update_shallow)
870                 set_option(transport, TRANS_OPT_UPDATE_SHALLOW, "yes");
871         return transport;
872 }
873
874 static void backfill_tags(struct transport *transport, struct ref *ref_map)
875 {
876         if (transport->cannot_reuse) {
877                 gsecondary = prepare_transport(transport->remote);
878                 transport = gsecondary;
879         }
880
881         transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
882         transport_set_option(transport, TRANS_OPT_DEPTH, "0");
883         fetch_refs(transport, ref_map);
884
885         if (gsecondary) {
886                 transport_disconnect(gsecondary);
887                 gsecondary = NULL;
888         }
889 }
890
891 static int do_fetch(struct transport *transport,
892                     struct refspec *refs, int ref_count)
893 {
894         struct string_list existing_refs = STRING_LIST_INIT_DUP;
895         struct ref *ref_map;
896         struct ref *rm;
897         int autotags = (transport->remote->fetch_tags == 1);
898         int retcode = 0;
899
900         for_each_ref(add_existing, &existing_refs);
901
902         if (tags == TAGS_DEFAULT) {
903                 if (transport->remote->fetch_tags == 2)
904                         tags = TAGS_SET;
905                 if (transport->remote->fetch_tags == -1)
906                         tags = TAGS_UNSET;
907         }
908
909         if (!transport->get_refs_list || !transport->fetch)
910                 die(_("Don't know how to fetch from %s"), transport->url);
911
912         /* if not appending, truncate FETCH_HEAD */
913         if (!append && !dry_run) {
914                 retcode = truncate_fetch_head();
915                 if (retcode)
916                         goto cleanup;
917         }
918
919         ref_map = get_ref_map(transport, refs, ref_count, tags, &autotags);
920         if (!update_head_ok)
921                 check_not_current_branch(ref_map);
922
923         for (rm = ref_map; rm; rm = rm->next) {
924                 if (rm->peer_ref) {
925                         struct string_list_item *peer_item =
926                                 string_list_lookup(&existing_refs,
927                                                    rm->peer_ref->name);
928                         if (peer_item) {
929                                 struct object_id *old_oid = peer_item->util;
930                                 hashcpy(rm->peer_ref->old_sha1, old_oid->hash);
931                         }
932                 }
933         }
934
935         if (tags == TAGS_DEFAULT && autotags)
936                 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
937         if (prune) {
938                 /*
939                  * We only prune based on refspecs specified
940                  * explicitly (via command line or configuration); we
941                  * don't care whether --tags was specified.
942                  */
943                 if (ref_count) {
944                         prune_refs(refs, ref_count, ref_map, transport->url);
945                 } else {
946                         prune_refs(transport->remote->fetch,
947                                    transport->remote->fetch_refspec_nr,
948                                    ref_map,
949                                    transport->url);
950                 }
951         }
952         if (fetch_refs(transport, ref_map)) {
953                 free_refs(ref_map);
954                 retcode = 1;
955                 goto cleanup;
956         }
957         free_refs(ref_map);
958
959         /* if neither --no-tags nor --tags was specified, do automated tag
960          * following ... */
961         if (tags == TAGS_DEFAULT && autotags) {
962                 struct ref **tail = &ref_map;
963                 ref_map = NULL;
964                 find_non_local_tags(transport, &ref_map, &tail);
965                 if (ref_map)
966                         backfill_tags(transport, ref_map);
967                 free_refs(ref_map);
968         }
969
970  cleanup:
971         string_list_clear(&existing_refs, 1);
972         return retcode;
973 }
974
975 static int get_one_remote_for_fetch(struct remote *remote, void *priv)
976 {
977         struct string_list *list = priv;
978         if (!remote->skip_default_update)
979                 string_list_append(list, remote->name);
980         return 0;
981 }
982
983 struct remote_group_data {
984         const char *name;
985         struct string_list *list;
986 };
987
988 static int get_remote_group(const char *key, const char *value, void *priv)
989 {
990         struct remote_group_data *g = priv;
991
992         if (skip_prefix(key, "remotes.", &key) && !strcmp(key, g->name)) {
993                 /* split list by white space */
994                 while (*value) {
995                         size_t wordlen = strcspn(value, " \t\n");
996
997                         if (wordlen >= 1)
998                                 string_list_append(g->list,
999                                                    xstrndup(value, wordlen));
1000                         value += wordlen + (value[wordlen] != '\0');
1001                 }
1002         }
1003
1004         return 0;
1005 }
1006
1007 static int add_remote_or_group(const char *name, struct string_list *list)
1008 {
1009         int prev_nr = list->nr;
1010         struct remote_group_data g;
1011         g.name = name; g.list = list;
1012
1013         git_config(get_remote_group, &g);
1014         if (list->nr == prev_nr) {
1015                 struct remote *remote;
1016                 if (!remote_is_configured(name))
1017                         return 0;
1018                 remote = remote_get(name);
1019                 string_list_append(list, remote->name);
1020         }
1021         return 1;
1022 }
1023
1024 static void add_options_to_argv(struct argv_array *argv)
1025 {
1026         if (dry_run)
1027                 argv_array_push(argv, "--dry-run");
1028         if (prune != -1)
1029                 argv_array_push(argv, prune ? "--prune" : "--no-prune");
1030         if (update_head_ok)
1031                 argv_array_push(argv, "--update-head-ok");
1032         if (force)
1033                 argv_array_push(argv, "--force");
1034         if (keep)
1035                 argv_array_push(argv, "--keep");
1036         if (recurse_submodules == RECURSE_SUBMODULES_ON)
1037                 argv_array_push(argv, "--recurse-submodules");
1038         else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND)
1039                 argv_array_push(argv, "--recurse-submodules=on-demand");
1040         if (tags == TAGS_SET)
1041                 argv_array_push(argv, "--tags");
1042         else if (tags == TAGS_UNSET)
1043                 argv_array_push(argv, "--no-tags");
1044         if (verbosity >= 2)
1045                 argv_array_push(argv, "-v");
1046         if (verbosity >= 1)
1047                 argv_array_push(argv, "-v");
1048         else if (verbosity < 0)
1049                 argv_array_push(argv, "-q");
1050
1051 }
1052
1053 static int fetch_multiple(struct string_list *list)
1054 {
1055         int i, result = 0;
1056         struct argv_array argv = ARGV_ARRAY_INIT;
1057
1058         if (!append && !dry_run) {
1059                 int errcode = truncate_fetch_head();
1060                 if (errcode)
1061                         return errcode;
1062         }
1063
1064         argv_array_pushl(&argv, "fetch", "--append", NULL);
1065         add_options_to_argv(&argv);
1066
1067         for (i = 0; i < list->nr; i++) {
1068                 const char *name = list->items[i].string;
1069                 argv_array_push(&argv, name);
1070                 if (verbosity >= 0)
1071                         printf(_("Fetching %s\n"), name);
1072                 if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
1073                         error(_("Could not fetch %s"), name);
1074                         result = 1;
1075                 }
1076                 argv_array_pop(&argv);
1077         }
1078
1079         argv_array_clear(&argv);
1080         return result;
1081 }
1082
1083 static int fetch_one(struct remote *remote, int argc, const char **argv)
1084 {
1085         static const char **refs = NULL;
1086         struct refspec *refspec;
1087         int ref_nr = 0;
1088         int exit_code;
1089
1090         if (!remote)
1091                 die(_("No remote repository specified.  Please, specify either a URL or a\n"
1092                     "remote name from which new revisions should be fetched."));
1093
1094         gtransport = prepare_transport(remote);
1095
1096         if (prune < 0) {
1097                 /* no command line request */
1098                 if (0 <= gtransport->remote->prune)
1099                         prune = gtransport->remote->prune;
1100                 else if (0 <= fetch_prune_config)
1101                         prune = fetch_prune_config;
1102                 else
1103                         prune = PRUNE_BY_DEFAULT;
1104         }
1105
1106         if (argc > 0) {
1107                 int j = 0;
1108                 int i;
1109                 refs = xcalloc(argc + 1, sizeof(const char *));
1110                 for (i = 0; i < argc; i++) {
1111                         if (!strcmp(argv[i], "tag")) {
1112                                 i++;
1113                                 if (i >= argc)
1114                                         die(_("You need to specify a tag name."));
1115                                 refs[j++] = xstrfmt("refs/tags/%s:refs/tags/%s",
1116                                                     argv[i], argv[i]);
1117                         } else
1118                                 refs[j++] = argv[i];
1119                 }
1120                 refs[j] = NULL;
1121                 ref_nr = j;
1122         }
1123
1124         sigchain_push_common(unlock_pack_on_signal);
1125         atexit(unlock_pack);
1126         refspec = parse_fetch_refspec(ref_nr, refs);
1127         exit_code = do_fetch(gtransport, refspec, ref_nr);
1128         free_refspec(ref_nr, refspec);
1129         transport_disconnect(gtransport);
1130         gtransport = NULL;
1131         return exit_code;
1132 }
1133
1134 int cmd_fetch(int argc, const char **argv, const char *prefix)
1135 {
1136         int i;
1137         struct string_list list = STRING_LIST_INIT_NODUP;
1138         struct remote *remote;
1139         int result = 0;
1140         struct argv_array argv_gc_auto = ARGV_ARRAY_INIT;
1141
1142         packet_trace_identity("fetch");
1143
1144         /* Record the command line for the reflog */
1145         strbuf_addstr(&default_rla, "fetch");
1146         for (i = 1; i < argc; i++)
1147                 strbuf_addf(&default_rla, " %s", argv[i]);
1148
1149         git_config(git_fetch_config, NULL);
1150
1151         argc = parse_options(argc, argv, prefix,
1152                              builtin_fetch_options, builtin_fetch_usage, 0);
1153
1154         if (unshallow) {
1155                 if (depth)
1156                         die(_("--depth and --unshallow cannot be used together"));
1157                 else if (!is_repository_shallow())
1158                         die(_("--unshallow on a complete repository does not make sense"));
1159                 else {
1160                         static char inf_depth[12];
1161                         sprintf(inf_depth, "%d", INFINITE_DEPTH);
1162                         depth = inf_depth;
1163                 }
1164         }
1165
1166         /* no need to be strict, transport_set_option() will validate it again */
1167         if (depth && atoi(depth) < 1)
1168                 die(_("depth %s is not a positive number"), depth);
1169
1170         if (recurse_submodules != RECURSE_SUBMODULES_OFF) {
1171                 if (recurse_submodules_default) {
1172                         int arg = parse_fetch_recurse_submodules_arg("--recurse-submodules-default", recurse_submodules_default);
1173                         set_config_fetch_recurse_submodules(arg);
1174                 }
1175                 gitmodules_config();
1176                 git_config(submodule_config, NULL);
1177         }
1178
1179         if (all) {
1180                 if (argc == 1)
1181                         die(_("fetch --all does not take a repository argument"));
1182                 else if (argc > 1)
1183                         die(_("fetch --all does not make sense with refspecs"));
1184                 (void) for_each_remote(get_one_remote_for_fetch, &list);
1185                 result = fetch_multiple(&list);
1186         } else if (argc == 0) {
1187                 /* No arguments -- use default remote */
1188                 remote = remote_get(NULL);
1189                 result = fetch_one(remote, argc, argv);
1190         } else if (multiple) {
1191                 /* All arguments are assumed to be remotes or groups */
1192                 for (i = 0; i < argc; i++)
1193                         if (!add_remote_or_group(argv[i], &list))
1194                                 die(_("No such remote or remote group: %s"), argv[i]);
1195                 result = fetch_multiple(&list);
1196         } else {
1197                 /* Single remote or group */
1198                 (void) add_remote_or_group(argv[0], &list);
1199                 if (list.nr > 1) {
1200                         /* More than one remote */
1201                         if (argc > 1)
1202                                 die(_("Fetching a group and specifying refspecs does not make sense"));
1203                         result = fetch_multiple(&list);
1204                 } else {
1205                         /* Zero or one remotes */
1206                         remote = remote_get(argv[0]);
1207                         result = fetch_one(remote, argc-1, argv+1);
1208                 }
1209         }
1210
1211         if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
1212                 struct argv_array options = ARGV_ARRAY_INIT;
1213
1214                 add_options_to_argv(&options);
1215                 result = fetch_populated_submodules(&options,
1216                                                     submodule_prefix,
1217                                                     recurse_submodules,
1218                                                     verbosity < 0);
1219                 argv_array_clear(&options);
1220         }
1221
1222         /* All names were strdup()ed or strndup()ed */
1223         list.strdup_strings = 1;
1224         string_list_clear(&list, 0);
1225
1226         argv_array_pushl(&argv_gc_auto, "gc", "--auto", NULL);
1227         if (verbosity < 0)
1228                 argv_array_push(&argv_gc_auto, "--quiet");
1229         run_command_v_opt(argv_gc_auto.argv, RUN_GIT_CMD);
1230         argv_array_clear(&argv_gc_auto);
1231
1232         return result;
1233 }