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