git.oblomov.eu Git - git/blob - 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                 struct strbuf quickref = STRBUF_INIT;
 532                 int r;
 533                 strbuf_add_unique_abbrev(&quickref, current->object.sha1, DEFAULT_ABBREV);
 534                 strbuf_addstr(&quickref, "..");
 535                 strbuf_add_unique_abbrev(&quickref, 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.buf,
 543                             REFCOL_WIDTH, remote, pretty_ref,
 544                             r ? _("  (unable to update local ref)") : "");
 545                 strbuf_release(&quickref);
 546                 return r;
 547         } else if (force || ref->force) {
 548                 struct strbuf quickref = STRBUF_INIT;
 549                 int r;
 550                 strbuf_add_unique_abbrev(&quickref, current->object.sha1, DEFAULT_ABBREV);
 551                 strbuf_addstr(&quickref, "...");
 552                 strbuf_add_unique_abbrev(&quickref, ref->new_sha1, DEFAULT_ABBREV);
 553                 if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
 554                     (recurse_submodules != RECURSE_SUBMODULES_ON))
 555                         check_for_new_submodule_commits(ref->new_sha1);
 556                 r = s_update_ref("forced-update", ref, 1);
 557                 strbuf_addf(display, "%c %-*s %-*s -> %s  (%s)",
 558                             r ? '!' : '+',
 559                             TRANSPORT_SUMMARY_WIDTH, quickref.buf,
 560                             REFCOL_WIDTH, remote, pretty_ref,
 561                             r ? _("unable to update local ref") : _("forced update"));
 562                 strbuf_release(&quickref);
 563                 return r;
 564         } else {
 565                 strbuf_addf(display, "! %-*s %-*s -> %s  %s",
 566                             TRANSPORT_SUMMARY(_("[rejected]")),
 567                             REFCOL_WIDTH, remote, pretty_ref,
 568                             _("(non-fast-forward)"));
 569                 return 1;
 570         }
 571 }
 572
 573 static int iterate_ref_map(void *cb_data, unsigned char sha1[20])
 574 {
 575         struct ref **rm = cb_data;
 576         struct ref *ref = *rm;
 577
 578         while (ref && ref->status == REF_STATUS_REJECT_SHALLOW)
 579                 ref = ref->next;
 580         if (!ref)
 581                 return -1; /* end of the list */
 582         *rm = ref->next;
 583         hashcpy(sha1, ref->old_sha1);
 584         return 0;
 585 }
 586
 587 static int store_updated_refs(const char *raw_url, const char *remote_name,
 588                 struct ref *ref_map)
 589 {
 590         FILE *fp;
 591         struct commit *commit;
 592         int url_len, i, rc = 0;
 593         struct strbuf note = STRBUF_INIT;
 594         const char *what, *kind;
 595         struct ref *rm;
 596         char *url;
 597         const char *filename = dry_run ? "/dev/null" : git_path_fetch_head();
 598         int want_status;
 599
 600         fp = fopen(filename, "a");
 601         if (!fp)
 602                 return error(_("cannot open %s: %s\n"), filename, strerror(errno));
 603
 604         if (raw_url)
 605                 url = transport_anonymize_url(raw_url);
 606         else
 607                 url = xstrdup("foreign");
 608
 609         rm = ref_map;
 610         if (check_everything_connected(iterate_ref_map, 0, &rm)) {
 611                 rc = error(_("%s did not send all necessary objects\n"), url);
 612                 goto abort;
 613         }
 614
 615         /*
 616          * We do a pass for each fetch_head_status type in their enum order, so
 617          * merged entries are written before not-for-merge. That lets readers
 618          * use FETCH_HEAD as a refname to refer to the ref to be merged.
 619          */
 620         for (want_status = FETCH_HEAD_MERGE;
 621              want_status <= FETCH_HEAD_IGNORE;
 622              want_status++) {
 623                 for (rm = ref_map; rm; rm = rm->next) {
 624                         struct ref *ref = NULL;
 625                         const char *merge_status_marker = "";
 626
 627                         if (rm->status == REF_STATUS_REJECT_SHALLOW) {
 628                                 if (want_status == FETCH_HEAD_MERGE)
 629                                         warning(_("reject %s because shallow roots are not allowed to be updated"),
 630                                                 rm->peer_ref ? rm->peer_ref->name : rm->name);
 631                                 continue;
 632                         }
 633
 634                         commit = lookup_commit_reference_gently(rm->old_sha1, 1);
 635                         if (!commit)
 636                                 rm->fetch_head_status = FETCH_HEAD_NOT_FOR_MERGE;
 637
 638                         if (rm->fetch_head_status != want_status)
 639                                 continue;
 640
 641                         if (rm->peer_ref) {
 642                                 ref = xcalloc(1, sizeof(*ref) + strlen(rm->peer_ref->name) + 1);
 643                                 strcpy(ref->name, rm->peer_ref->name);
 644                                 hashcpy(ref->old_sha1, rm->peer_ref->old_sha1);
 645                                 hashcpy(ref->new_sha1, rm->old_sha1);
 646                                 ref->force = rm->peer_ref->force;
 647                         }
 648
 649
 650                         if (!strcmp(rm->name, "HEAD")) {
 651                                 kind = "";
 652                                 what = "";
 653                         }
 654                         else if (starts_with(rm->name, "refs/heads/")) {
 655                                 kind = "branch";
 656                                 what = rm->name + 11;
 657                         }
 658                         else if (starts_with(rm->name, "refs/tags/")) {
 659                                 kind = "tag";
 660                                 what = rm->name + 10;
 661                         }
 662                         else if (starts_with(rm->name, "refs/remotes/")) {
 663                                 kind = "remote-tracking branch";
 664                                 what = rm->name + 13;
 665                         }
 666                         else {
 667                                 kind = "";
 668                                 what = rm->name;
 669                         }
 670
 671                         url_len = strlen(url);
 672                         for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
 673                                 ;
 674                         url_len = i + 1;
 675                         if (4 < i && !strncmp(".git", url + i - 3, 4))
 676                                 url_len = i - 3;
 677
 678                         strbuf_reset(&note);
 679                         if (*what) {
 680                                 if (*kind)
 681                                         strbuf_addf(&note, "%s ", kind);
 682                                 strbuf_addf(&note, "'%s' of ", what);
 683                         }
 684                         switch (rm->fetch_head_status) {
 685                         case FETCH_HEAD_NOT_FOR_MERGE:
 686                                 merge_status_marker = "not-for-merge";
 687                                 /* fall-through */
 688                         case FETCH_HEAD_MERGE:
 689                                 fprintf(fp, "%s\t%s\t%s",
 690                                         sha1_to_hex(rm->old_sha1),
 691                                         merge_status_marker,
 692                                         note.buf);
 693                                 for (i = 0; i < url_len; ++i)
 694                                         if ('\n' == url[i])
 695                                                 fputs("\\n", fp);
 696                                         else
 697                                                 fputc(url[i], fp);
 698                                 fputc('\n', fp);
 699                                 break;
 700                         default:
 701                                 /* do not write anything to FETCH_HEAD */
 702                                 break;
 703                         }
 704
 705                         strbuf_reset(&note);
 706                         if (ref) {
 707                                 rc |= update_local_ref(ref, what, rm, &note);
 708                                 free(ref);
 709                         } else
 710                                 strbuf_addf(&note, "* %-*s %-*s -> FETCH_HEAD",
 711                                             TRANSPORT_SUMMARY_WIDTH,
 712                                             *kind ? kind : "branch",
 713                                             REFCOL_WIDTH,
 714                                             *what ? what : "HEAD");
 715                         if (note.len) {
 716                                 if (verbosity >= 0 && !shown_url) {
 717                                         fprintf(stderr, _("From %.*s\n"),
 718                                                         url_len, url);
 719                                         shown_url = 1;
 720                                 }
 721                                 if (verbosity >= 0)
 722                                         fprintf(stderr, " %s\n", note.buf);
 723                         }
 724                 }
 725         }
 726
 727         if (rc & STORE_REF_ERROR_DF_CONFLICT)
 728                 error(_("some local refs could not be updated; try running\n"
 729                       " 'git remote prune %s' to remove any old, conflicting "
 730                       "branches"), remote_name);
 731
 732  abort:
 733         strbuf_release(&note);
 734         free(url);
 735         fclose(fp);
 736         return rc;
 737 }
 738
 739 /*
 740  * We would want to bypass the object transfer altogether if
 741  * everything we are going to fetch already exists and is connected
 742  * locally.
 743  */
 744 static int quickfetch(struct ref *ref_map)
 745 {
 746         struct ref *rm = ref_map;
 747
 748         /*
 749          * If we are deepening a shallow clone we already have these
 750          * objects reachable.  Running rev-list here will return with
 751          * a good (0) exit status and we'll bypass the fetch that we
 752          * really need to perform.  Claiming failure now will ensure
 753          * we perform the network exchange to deepen our history.
 754          */
 755         if (depth)
 756                 return -1;
 757         return check_everything_connected(iterate_ref_map, 1, &rm);
 758 }
 759
 760 static int fetch_refs(struct transport *transport, struct ref *ref_map)
 761 {
 762         int ret = quickfetch(ref_map);
 763         if (ret)
 764                 ret = transport_fetch_refs(transport, ref_map);
 765         if (!ret)
 766                 ret |= store_updated_refs(transport->url,
 767                                 transport->remote->name,
 768                                 ref_map);
 769         transport_unlock_pack(transport);
 770         return ret;
 771 }
 772
 773 static int prune_refs(struct refspec *refs, int ref_count, struct ref *ref_map,
 774                 const char *raw_url)
 775 {
 776         int url_len, i, result = 0;
 777         struct ref *ref, *stale_refs = get_stale_heads(refs, ref_count, ref_map);
 778         char *url;
 779         const char *dangling_msg = dry_run
 780                 ? _("   (%s will become dangling)")
 781                 : _("   (%s has become dangling)");
 782
 783         if (raw_url)
 784                 url = transport_anonymize_url(raw_url);
 785         else
 786                 url = xstrdup("foreign");
 787
 788         url_len = strlen(url);
 789         for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
 790                 ;
 791
 792         url_len = i + 1;
 793         if (4 < i && !strncmp(".git", url + i - 3, 4))
 794                 url_len = i - 3;
 795
 796         if (!dry_run) {
 797                 struct string_list refnames = STRING_LIST_INIT_NODUP;
 798
 799                 for (ref = stale_refs; ref; ref = ref->next)
 800                         string_list_append(&refnames, ref->name);
 801
 802                 result = delete_refs(&refnames);
 803                 string_list_clear(&refnames, 0);
 804         }
 805
 806         if (verbosity >= 0) {
 807                 for (ref = stale_refs; ref; ref = ref->next) {
 808                         if (!shown_url) {
 809                                 fprintf(stderr, _("From %.*s\n"), url_len, url);
 810                                 shown_url = 1;
 811                         }
 812                         fprintf(stderr, " x %-*s %-*s -> %s\n",
 813                                 TRANSPORT_SUMMARY(_("[deleted]")),
 814                                 REFCOL_WIDTH, _("(none)"), prettify_refname(ref->name));
 815                         warn_dangling_symref(stderr, dangling_msg, ref->name);
 816                 }
 817         }
 818
 819         free(url);
 820         free_refs(stale_refs);
 821         return result;
 822 }
 823
 824 static void check_not_current_branch(struct ref *ref_map)
 825 {
 826         struct branch *current_branch = branch_get(NULL);
 827
 828         if (is_bare_repository() || !current_branch)
 829                 return;
 830
 831         for (; ref_map; ref_map = ref_map->next)
 832                 if (ref_map->peer_ref && !strcmp(current_branch->refname,
 833                                         ref_map->peer_ref->name))
 834                         die(_("Refusing to fetch into current branch %s "
 835                             "of non-bare repository"), current_branch->refname);
 836 }
 837
 838 static int truncate_fetch_head(void)
 839 {
 840         const char *filename = git_path_fetch_head();
 841         FILE *fp = fopen(filename, "w");
 842
 843         if (!fp)
 844                 return error(_("cannot open %s: %s\n"), filename, strerror(errno));
 845         fclose(fp);
 846         return 0;
 847 }
 848
 849 static void set_option(struct transport *transport, const char *name, const char *value)
 850 {
 851         int r = transport_set_option(transport, name, value);
 852         if (r < 0)
 853                 die(_("Option \"%s\" value \"%s\" is not valid for %s"),
 854                     name, value, transport->url);
 855         if (r > 0)
 856                 warning(_("Option \"%s\" is ignored for %s\n"),
 857                         name, transport->url);
 858 }
 859
 860 static struct transport *prepare_transport(struct remote *remote)
 861 {
 862         struct transport *transport;
 863         transport = transport_get(remote, NULL);
 864         transport_set_verbosity(transport, verbosity, progress);
 865         if (upload_pack)
 866                 set_option(transport, TRANS_OPT_UPLOADPACK, upload_pack);
 867         if (keep)
 868                 set_option(transport, TRANS_OPT_KEEP, "yes");
 869         if (depth)
 870                 set_option(transport, TRANS_OPT_DEPTH, depth);
 871         if (update_shallow)
 872                 set_option(transport, TRANS_OPT_UPDATE_SHALLOW, "yes");
 873         return transport;
 874 }
 875
 876 static void backfill_tags(struct transport *transport, struct ref *ref_map)
 877 {
 878         if (transport->cannot_reuse) {
 879                 gsecondary = prepare_transport(transport->remote);
 880                 transport = gsecondary;
 881         }
 882
 883         transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
 884         transport_set_option(transport, TRANS_OPT_DEPTH, "0");
 885         fetch_refs(transport, ref_map);
 886
 887         if (gsecondary) {
 888                 transport_disconnect(gsecondary);
 889                 gsecondary = NULL;
 890         }
 891 }
 892
 893 static int do_fetch(struct transport *transport,
 894                     struct refspec *refs, int ref_count)
 895 {
 896         struct string_list existing_refs = STRING_LIST_INIT_DUP;
 897         struct ref *ref_map;
 898         struct ref *rm;
 899         int autotags = (transport->remote->fetch_tags == 1);
 900         int retcode = 0;
 901
 902         for_each_ref(add_existing, &existing_refs);
 903
 904         if (tags == TAGS_DEFAULT) {
 905                 if (transport->remote->fetch_tags == 2)
 906                         tags = TAGS_SET;
 907                 if (transport->remote->fetch_tags == -1)
 908                         tags = TAGS_UNSET;
 909         }
 910
 911         if (!transport->get_refs_list || !transport->fetch)
 912                 die(_("Don't know how to fetch from %s"), transport->url);
 913
 914         /* if not appending, truncate FETCH_HEAD */
 915         if (!append && !dry_run) {
 916                 retcode = truncate_fetch_head();
 917                 if (retcode)
 918                         goto cleanup;
 919         }
 920
 921         ref_map = get_ref_map(transport, refs, ref_count, tags, &autotags);
 922         if (!update_head_ok)
 923                 check_not_current_branch(ref_map);
 924
 925         for (rm = ref_map; rm; rm = rm->next) {
 926                 if (rm->peer_ref) {
 927                         struct string_list_item *peer_item =
 928                                 string_list_lookup(&existing_refs,
 929                                                    rm->peer_ref->name);
 930                         if (peer_item) {
 931                                 struct object_id *old_oid = peer_item->util;
 932                                 hashcpy(rm->peer_ref->old_sha1, old_oid->hash);
 933                         }
 934                 }
 935         }
 936
 937         if (tags == TAGS_DEFAULT && autotags)
 938                 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
 939         if (prune) {
 940                 /*
 941                  * We only prune based on refspecs specified
 942                  * explicitly (via command line or configuration); we
 943                  * don't care whether --tags was specified.
 944                  */
 945                 if (ref_count) {
 946                         prune_refs(refs, ref_count, ref_map, transport->url);
 947                 } else {
 948                         prune_refs(transport->remote->fetch,
 949                                    transport->remote->fetch_refspec_nr,
 950                                    ref_map,
 951                                    transport->url);
 952                 }
 953         }
 954         if (fetch_refs(transport, ref_map)) {
 955                 free_refs(ref_map);
 956                 retcode = 1;
 957                 goto cleanup;
 958         }
 959         free_refs(ref_map);
 960
 961         /* if neither --no-tags nor --tags was specified, do automated tag
 962          * following ... */
 963         if (tags == TAGS_DEFAULT && autotags) {
 964                 struct ref **tail = &ref_map;
 965                 ref_map = NULL;
 966                 find_non_local_tags(transport, &ref_map, &tail);
 967                 if (ref_map)
 968                         backfill_tags(transport, ref_map);
 969                 free_refs(ref_map);
 970         }
 971
 972  cleanup:
 973         string_list_clear(&existing_refs, 1);
 974         return retcode;
 975 }
 976
 977 static int get_one_remote_for_fetch(struct remote *remote, void *priv)
 978 {
 979         struct string_list *list = priv;
 980         if (!remote->skip_default_update)
 981                 string_list_append(list, remote->name);
 982         return 0;
 983 }
 984
 985 struct remote_group_data {
 986         const char *name;
 987         struct string_list *list;
 988 };
 989
 990 static int get_remote_group(const char *key, const char *value, void *priv)
 991 {
 992         struct remote_group_data *g = priv;
 993
 994         if (skip_prefix(key, "remotes.", &key) && !strcmp(key, g->name)) {
 995                 /* split list by white space */
 996                 while (*value) {
 997                         size_t wordlen = strcspn(value, " \t\n");
 998
 999                         if (wordlen >= 1)
1000                                 string_list_append(g->list,
1001                                                    xstrndup(value, wordlen));
1002                         value += wordlen + (value[wordlen] != '\0');
1003                 }
1004         }
1005
1006         return 0;
1007 }
1008
1009 static int add_remote_or_group(const char *name, struct string_list *list)
1010 {
1011         int prev_nr = list->nr;
1012         struct remote_group_data g;
1013         g.name = name; g.list = list;
1014
1015         git_config(get_remote_group, &g);
1016         if (list->nr == prev_nr) {
1017                 struct remote *remote;
1018                 if (!remote_is_configured(name))
1019                         return 0;
1020                 remote = remote_get(name);
1021                 string_list_append(list, remote->name);
1022         }
1023         return 1;
1024 }
1025
1026 static void add_options_to_argv(struct argv_array *argv)
1027 {
1028         if (dry_run)
1029                 argv_array_push(argv, "--dry-run");
1030         if (prune != -1)
1031                 argv_array_push(argv, prune ? "--prune" : "--no-prune");
1032         if (update_head_ok)
1033                 argv_array_push(argv, "--update-head-ok");
1034         if (force)
1035                 argv_array_push(argv, "--force");
1036         if (keep)
1037                 argv_array_push(argv, "--keep");
1038         if (recurse_submodules == RECURSE_SUBMODULES_ON)
1039                 argv_array_push(argv, "--recurse-submodules");
1040         else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND)
1041                 argv_array_push(argv, "--recurse-submodules=on-demand");
1042         if (tags == TAGS_SET)
1043                 argv_array_push(argv, "--tags");
1044         else if (tags == TAGS_UNSET)
1045                 argv_array_push(argv, "--no-tags");
1046         if (verbosity >= 2)
1047                 argv_array_push(argv, "-v");
1048         if (verbosity >= 1)
1049                 argv_array_push(argv, "-v");
1050         else if (verbosity < 0)
1051                 argv_array_push(argv, "-q");
1052
1053 }
1054
1055 static int fetch_multiple(struct string_list *list)
1056 {
1057         int i, result = 0;
1058         struct argv_array argv = ARGV_ARRAY_INIT;
1059
1060         if (!append && !dry_run) {
1061                 int errcode = truncate_fetch_head();
1062                 if (errcode)
1063                         return errcode;
1064         }
1065
1066         argv_array_pushl(&argv, "fetch", "--append", NULL);
1067         add_options_to_argv(&argv);
1068
1069         for (i = 0; i < list->nr; i++) {
1070                 const char *name = list->items[i].string;
1071                 argv_array_push(&argv, name);
1072                 if (verbosity >= 0)
1073                         printf(_("Fetching %s\n"), name);
1074                 if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
1075                         error(_("Could not fetch %s"), name);
1076                         result = 1;
1077                 }
1078                 argv_array_pop(&argv);
1079         }
1080
1081         argv_array_clear(&argv);
1082         return result;
1083 }
1084
1085 static int fetch_one(struct remote *remote, int argc, const char **argv)
1086 {
1087         static const char **refs = NULL;
1088         struct refspec *refspec;
1089         int ref_nr = 0;
1090         int exit_code;
1091
1092         if (!remote)
1093                 die(_("No remote repository specified.  Please, specify either a URL or a\n"
1094                     "remote name from which new revisions should be fetched."));
1095
1096         gtransport = prepare_transport(remote);
1097
1098         if (prune < 0) {
1099                 /* no command line request */
1100                 if (0 <= gtransport->remote->prune)
1101                         prune = gtransport->remote->prune;
1102                 else if (0 <= fetch_prune_config)
1103                         prune = fetch_prune_config;
1104                 else
1105                         prune = PRUNE_BY_DEFAULT;
1106         }
1107
1108         if (argc > 0) {
1109                 int j = 0;
1110                 int i;
1111                 refs = xcalloc(argc + 1, sizeof(const char *));
1112                 for (i = 0; i < argc; i++) {
1113                         if (!strcmp(argv[i], "tag")) {
1114                                 i++;
1115                                 if (i >= argc)
1116                                         die(_("You need to specify a tag name."));
1117                                 refs[j++] = xstrfmt("refs/tags/%s:refs/tags/%s",
1118                                                     argv[i], argv[i]);
1119                         } else
1120                                 refs[j++] = argv[i];
1121                 }
1122                 refs[j] = NULL;
1123                 ref_nr = j;
1124         }
1125
1126         sigchain_push_common(unlock_pack_on_signal);
1127         atexit(unlock_pack);
1128         refspec = parse_fetch_refspec(ref_nr, refs);
1129         exit_code = do_fetch(gtransport, refspec, ref_nr);
1130         free_refspec(ref_nr, refspec);
1131         transport_disconnect(gtransport);
1132         gtransport = NULL;
1133         return exit_code;
1134 }
1135
1136 int cmd_fetch(int argc, const char **argv, const char *prefix)
1137 {
1138         int i;
1139         struct string_list list = STRING_LIST_INIT_NODUP;
1140         struct remote *remote;
1141         int result = 0;
1142         struct argv_array argv_gc_auto = ARGV_ARRAY_INIT;
1143
1144         packet_trace_identity("fetch");
1145
1146         /* Record the command line for the reflog */
1147         strbuf_addstr(&default_rla, "fetch");
1148         for (i = 1; i < argc; i++)
1149                 strbuf_addf(&default_rla, " %s", argv[i]);
1150
1151         git_config(git_fetch_config, NULL);
1152
1153         argc = parse_options(argc, argv, prefix,
1154                              builtin_fetch_options, builtin_fetch_usage, 0);
1155
1156         if (unshallow) {
1157                 if (depth)
1158                         die(_("--depth and --unshallow cannot be used together"));
1159                 else if (!is_repository_shallow())
1160                         die(_("--unshallow on a complete repository does not make sense"));
1161                 else
1162                         depth = xstrfmt("%d", INFINITE_DEPTH);
1163         }
1164
1165         /* no need to be strict, transport_set_option() will validate it again */
1166         if (depth && atoi(depth) < 1)
1167                 die(_("depth %s is not a positive number"), depth);
1168
1169         if (recurse_submodules != RECURSE_SUBMODULES_OFF) {
1170                 if (recurse_submodules_default) {
1171                         int arg = parse_fetch_recurse_submodules_arg("--recurse-submodules-default", recurse_submodules_default);
1172                         set_config_fetch_recurse_submodules(arg);
1173                 }
1174                 gitmodules_config();
1175                 git_config(submodule_config, NULL);
1176         }
1177
1178         if (all) {
1179                 if (argc == 1)
1180                         die(_("fetch --all does not take a repository argument"));
1181                 else if (argc > 1)
1182                         die(_("fetch --all does not make sense with refspecs"));
1183                 (void) for_each_remote(get_one_remote_for_fetch, &list);
1184                 result = fetch_multiple(&list);
1185         } else if (argc == 0) {
1186                 /* No arguments -- use default remote */
1187                 remote = remote_get(NULL);
1188                 result = fetch_one(remote, argc, argv);
1189         } else if (multiple) {
1190                 /* All arguments are assumed to be remotes or groups */
1191                 for (i = 0; i < argc; i++)
1192                         if (!add_remote_or_group(argv[i], &list))
1193                                 die(_("No such remote or remote group: %s"), argv[i]);
1194                 result = fetch_multiple(&list);
1195         } else {
1196                 /* Single remote or group */
1197                 (void) add_remote_or_group(argv[0], &list);
1198                 if (list.nr > 1) {
1199                         /* More than one remote */
1200                         if (argc > 1)
1201                                 die(_("Fetching a group and specifying refspecs does not make sense"));
1202                         result = fetch_multiple(&list);
1203                 } else {
1204                         /* Zero or one remotes */
1205                         remote = remote_get(argv[0]);
1206                         result = fetch_one(remote, argc-1, argv+1);
1207                 }
1208         }
1209
1210         if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
1211                 struct argv_array options = ARGV_ARRAY_INIT;
1212
1213                 add_options_to_argv(&options);
1214                 result = fetch_populated_submodules(&options,
1215                                                     submodule_prefix,
1216                                                     recurse_submodules,
1217                                                     verbosity < 0);
1218                 argv_array_clear(&options);
1219         }
1220
1221         /* All names were strdup()ed or strndup()ed */
1222         list.strdup_strings = 1;
1223         string_list_clear(&list, 0);
1224
1225         argv_array_pushl(&argv_gc_auto, "gc", "--auto", NULL);
1226         if (verbosity < 0)
1227                 argv_array_push(&argv_gc_auto, "--quiet");
1228         run_command_v_opt(argv_gc_auto.argv, RUN_GIT_CMD);
1229         argv_array_clear(&argv_gc_auto);
1230
1231         return result;
1232 }