builtin / fetch.con commit merge script: improve log message subject (13dd255)
   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 "transport.h"
  15
  16static const char * const builtin_fetch_usage[] = {
  17        "git fetch [<options>] [<repository> [<refspec>...]]",
  18        "git fetch [<options>] <group>",
  19        "git fetch --multiple [<options>] [<repository> | <group>]...",
  20        "git fetch --all [<options>]",
  21        NULL
  22};
  23
  24enum {
  25        TAGS_UNSET = 0,
  26        TAGS_DEFAULT = 1,
  27        TAGS_SET = 2
  28};
  29
  30static int all, append, dry_run, force, keep, multiple, prune, update_head_ok, verbosity;
  31static int progress;
  32static int tags = TAGS_DEFAULT;
  33static const char *depth;
  34static const char *upload_pack;
  35static struct strbuf default_rla = STRBUF_INIT;
  36static struct transport *transport;
  37
  38static struct option builtin_fetch_options[] = {
  39        OPT__VERBOSITY(&verbosity),
  40        OPT_BOOLEAN(0, "all", &all,
  41                    "fetch from all remotes"),
  42        OPT_BOOLEAN('a', "append", &append,
  43                    "append to .git/FETCH_HEAD instead of overwriting"),
  44        OPT_STRING(0, "upload-pack", &upload_pack, "PATH",
  45                   "path to upload pack on remote end"),
  46        OPT_BOOLEAN('f', "force", &force,
  47                    "force overwrite of local branch"),
  48        OPT_BOOLEAN('m', "multiple", &multiple,
  49                    "fetch from multiple remotes"),
  50        OPT_SET_INT('t', "tags", &tags,
  51                    "fetch all tags and associated objects", TAGS_SET),
  52        OPT_SET_INT('n', NULL, &tags,
  53                    "do not fetch all tags (--no-tags)", TAGS_UNSET),
  54        OPT_BOOLEAN('p', "prune", &prune,
  55                    "prune tracking branches no longer on remote"),
  56        OPT_BOOLEAN(0, "dry-run", &dry_run,
  57                    "dry run"),
  58        OPT_BOOLEAN('k', "keep", &keep, "keep downloaded pack"),
  59        OPT_BOOLEAN('u', "update-head-ok", &update_head_ok,
  60                    "allow updating of HEAD ref"),
  61        OPT_BOOLEAN(0, "progress", &progress, "force progress reporting"),
  62        OPT_STRING(0, "depth", &depth, "DEPTH",
  63                   "deepen history of shallow clone"),
  64        OPT_END()
  65};
  66
  67static void unlock_pack(void)
  68{
  69        if (transport)
  70                transport_unlock_pack(transport);
  71}
  72
  73static void unlock_pack_on_signal(int signo)
  74{
  75        unlock_pack();
  76        sigchain_pop(signo);
  77        raise(signo);
  78}
  79
  80static void add_merge_config(struct ref **head,
  81                           const struct ref *remote_refs,
  82                           struct branch *branch,
  83                           struct ref ***tail)
  84{
  85        int i;
  86
  87        for (i = 0; i < branch->merge_nr; i++) {
  88                struct ref *rm, **old_tail = *tail;
  89                struct refspec refspec;
  90
  91                for (rm = *head; rm; rm = rm->next) {
  92                        if (branch_merge_matches(branch, i, rm->name)) {
  93                                rm->merge = 1;
  94                                break;
  95                        }
  96                }
  97                if (rm)
  98                        continue;
  99
 100                /*
 101                 * Not fetched to a tracking branch?  We need to fetch
 102                 * it anyway to allow this branch's "branch.$name.merge"
 103                 * to be honored by 'git pull', but we do not have to
 104                 * fail if branch.$name.merge is misconfigured to point
 105                 * at a nonexisting branch.  If we were indeed called by
 106                 * 'git pull', it will notice the misconfiguration because
 107                 * there is no entry in the resulting FETCH_HEAD marked
 108                 * for merging.
 109                 */
 110                memset(&refspec, 0, sizeof(refspec));
 111                refspec.src = branch->merge[i]->src;
 112                get_fetch_map(remote_refs, &refspec, tail, 1);
 113                for (rm = *old_tail; rm; rm = rm->next)
 114                        rm->merge = 1;
 115        }
 116}
 117
 118static void find_non_local_tags(struct transport *transport,
 119                        struct ref **head,
 120                        struct ref ***tail);
 121
 122static struct ref *get_ref_map(struct transport *transport,
 123                               struct refspec *refs, int ref_count, int tags,
 124                               int *autotags)
 125{
 126        int i;
 127        struct ref *rm;
 128        struct ref *ref_map = NULL;
 129        struct ref **tail = &ref_map;
 130
 131        const struct ref *remote_refs = transport_get_remote_refs(transport);
 132
 133        if (ref_count || tags == TAGS_SET) {
 134                for (i = 0; i < ref_count; i++) {
 135                        get_fetch_map(remote_refs, &refs[i], &tail, 0);
 136                        if (refs[i].dst && refs[i].dst[0])
 137                                *autotags = 1;
 138                }
 139                /* Merge everything on the command line, but not --tags */
 140                for (rm = ref_map; rm; rm = rm->next)
 141                        rm->merge = 1;
 142                if (tags == TAGS_SET)
 143                        get_fetch_map(remote_refs, tag_refspec, &tail, 0);
 144        } else {
 145                /* Use the defaults */
 146                struct remote *remote = transport->remote;
 147                struct branch *branch = branch_get(NULL);
 148                int has_merge = branch_has_merge_config(branch);
 149                if (remote && (remote->fetch_refspec_nr || has_merge)) {
 150                        for (i = 0; i < remote->fetch_refspec_nr; i++) {
 151                                get_fetch_map(remote_refs, &remote->fetch[i], &tail, 0);
 152                                if (remote->fetch[i].dst &&
 153                                    remote->fetch[i].dst[0])
 154                                        *autotags = 1;
 155                                if (!i && !has_merge && ref_map &&
 156                                    !remote->fetch[0].pattern)
 157                                        ref_map->merge = 1;
 158                        }
 159                        /*
 160                         * if the remote we're fetching from is the same
 161                         * as given in branch.<name>.remote, we add the
 162                         * ref given in branch.<name>.merge, too.
 163                         */
 164                        if (has_merge &&
 165                            !strcmp(branch->remote_name, remote->name))
 166                                add_merge_config(&ref_map, remote_refs, branch, &tail);
 167                } else {
 168                        ref_map = get_remote_ref(remote_refs, "HEAD");
 169                        if (!ref_map)
 170                                die("Couldn't find remote ref HEAD");
 171                        ref_map->merge = 1;
 172                        tail = &ref_map->next;
 173                }
 174        }
 175        if (tags == TAGS_DEFAULT && *autotags)
 176                find_non_local_tags(transport, &ref_map, &tail);
 177        ref_remove_duplicates(ref_map);
 178
 179        return ref_map;
 180}
 181
 182#define STORE_REF_ERROR_OTHER 1
 183#define STORE_REF_ERROR_DF_CONFLICT 2
 184
 185static int s_update_ref(const char *action,
 186                        struct ref *ref,
 187                        int check_old)
 188{
 189        char msg[1024];
 190        char *rla = getenv("GIT_REFLOG_ACTION");
 191        static struct ref_lock *lock;
 192
 193        if (dry_run)
 194                return 0;
 195        if (!rla)
 196                rla = default_rla.buf;
 197        snprintf(msg, sizeof(msg), "%s: %s", rla, action);
 198        lock = lock_any_ref_for_update(ref->name,
 199                                       check_old ? ref->old_sha1 : NULL, 0);
 200        if (!lock)
 201                return errno == ENOTDIR ? STORE_REF_ERROR_DF_CONFLICT :
 202                                          STORE_REF_ERROR_OTHER;
 203        if (write_ref_sha1(lock, ref->new_sha1, msg) < 0)
 204                return errno == ENOTDIR ? STORE_REF_ERROR_DF_CONFLICT :
 205                                          STORE_REF_ERROR_OTHER;
 206        return 0;
 207}
 208
 209#define REFCOL_WIDTH  10
 210
 211static int update_local_ref(struct ref *ref,
 212                            const char *remote,
 213                            char *display)
 214{
 215        struct commit *current = NULL, *updated;
 216        enum object_type type;
 217        struct branch *current_branch = branch_get(NULL);
 218        const char *pretty_ref = prettify_refname(ref->name);
 219
 220        *display = 0;
 221        type = sha1_object_info(ref->new_sha1, NULL);
 222        if (type < 0)
 223                die("object %s not found", sha1_to_hex(ref->new_sha1));
 224
 225        if (!hashcmp(ref->old_sha1, ref->new_sha1)) {
 226                if (verbosity > 0)
 227                        sprintf(display, "= %-*s %-*s -> %s", TRANSPORT_SUMMARY_WIDTH,
 228                                "[up to date]", REFCOL_WIDTH, remote,
 229                                pretty_ref);
 230                return 0;
 231        }
 232
 233        if (current_branch &&
 234            !strcmp(ref->name, current_branch->name) &&
 235            !(update_head_ok || is_bare_repository()) &&
 236            !is_null_sha1(ref->old_sha1)) {
 237                /*
 238                 * If this is the head, and it's not okay to update
 239                 * the head, and the old value of the head isn't empty...
 240                 */
 241                sprintf(display, "! %-*s %-*s -> %s  (can't fetch in current branch)",
 242                        TRANSPORT_SUMMARY_WIDTH, "[rejected]", REFCOL_WIDTH, remote,
 243                        pretty_ref);
 244                return 1;
 245        }
 246
 247        if (!is_null_sha1(ref->old_sha1) &&
 248            !prefixcmp(ref->name, "refs/tags/")) {
 249                int r;
 250                r = s_update_ref("updating tag", ref, 0);
 251                sprintf(display, "%c %-*s %-*s -> %s%s", r ? '!' : '-',
 252                        TRANSPORT_SUMMARY_WIDTH, "[tag update]", REFCOL_WIDTH, remote,
 253                        pretty_ref, r ? "  (unable to update local ref)" : "");
 254                return r;
 255        }
 256
 257        current = lookup_commit_reference_gently(ref->old_sha1, 1);
 258        updated = lookup_commit_reference_gently(ref->new_sha1, 1);
 259        if (!current || !updated) {
 260                const char *msg;
 261                const char *what;
 262                int r;
 263                if (!strncmp(ref->name, "refs/tags/", 10)) {
 264                        msg = "storing tag";
 265                        what = "[new tag]";
 266                }
 267                else {
 268                        msg = "storing head";
 269                        what = "[new branch]";
 270                }
 271
 272                r = s_update_ref(msg, ref, 0);
 273                sprintf(display, "%c %-*s %-*s -> %s%s", r ? '!' : '*',
 274                        TRANSPORT_SUMMARY_WIDTH, what, REFCOL_WIDTH, remote, pretty_ref,
 275                        r ? "  (unable to update local ref)" : "");
 276                return r;
 277        }
 278
 279        if (in_merge_bases(current, &updated, 1)) {
 280                char quickref[83];
 281                int r;
 282                strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV));
 283                strcat(quickref, "..");
 284                strcat(quickref, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV));
 285                r = s_update_ref("fast-forward", ref, 1);
 286                sprintf(display, "%c %-*s %-*s -> %s%s", r ? '!' : ' ',
 287                        TRANSPORT_SUMMARY_WIDTH, quickref, REFCOL_WIDTH, remote,
 288                        pretty_ref, r ? "  (unable to update local ref)" : "");
 289                return r;
 290        } else if (force || ref->force) {
 291                char quickref[84];
 292                int r;
 293                strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV));
 294                strcat(quickref, "...");
 295                strcat(quickref, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV));
 296                r = s_update_ref("forced-update", ref, 1);
 297                sprintf(display, "%c %-*s %-*s -> %s  (%s)", r ? '!' : '+',
 298                        TRANSPORT_SUMMARY_WIDTH, quickref, REFCOL_WIDTH, remote,
 299                        pretty_ref,
 300                        r ? "unable to update local ref" : "forced update");
 301                return r;
 302        } else {
 303                sprintf(display, "! %-*s %-*s -> %s  (non-fast-forward)",
 304                        TRANSPORT_SUMMARY_WIDTH, "[rejected]", REFCOL_WIDTH, remote,
 305                        pretty_ref);
 306                return 1;
 307        }
 308}
 309
 310static int store_updated_refs(const char *raw_url, const char *remote_name,
 311                struct ref *ref_map)
 312{
 313        FILE *fp;
 314        struct commit *commit;
 315        int url_len, i, note_len, shown_url = 0, rc = 0;
 316        char note[1024];
 317        const char *what, *kind;
 318        struct ref *rm;
 319        char *url, *filename = dry_run ? "/dev/null" : git_path("FETCH_HEAD");
 320
 321        fp = fopen(filename, "a");
 322        if (!fp)
 323                return error("cannot open %s: %s\n", filename, strerror(errno));
 324
 325        if (raw_url)
 326                url = transport_anonymize_url(raw_url);
 327        else
 328                url = xstrdup("foreign");
 329        for (rm = ref_map; rm; rm = rm->next) {
 330                struct ref *ref = NULL;
 331
 332                if (rm->peer_ref) {
 333                        ref = xcalloc(1, sizeof(*ref) + strlen(rm->peer_ref->name) + 1);
 334                        strcpy(ref->name, rm->peer_ref->name);
 335                        hashcpy(ref->old_sha1, rm->peer_ref->old_sha1);
 336                        hashcpy(ref->new_sha1, rm->old_sha1);
 337                        ref->force = rm->peer_ref->force;
 338                }
 339
 340                commit = lookup_commit_reference_gently(rm->old_sha1, 1);
 341                if (!commit)
 342                        rm->merge = 0;
 343
 344                if (!strcmp(rm->name, "HEAD")) {
 345                        kind = "";
 346                        what = "";
 347                }
 348                else if (!prefixcmp(rm->name, "refs/heads/")) {
 349                        kind = "branch";
 350                        what = rm->name + 11;
 351                }
 352                else if (!prefixcmp(rm->name, "refs/tags/")) {
 353                        kind = "tag";
 354                        what = rm->name + 10;
 355                }
 356                else if (!prefixcmp(rm->name, "refs/remotes/")) {
 357                        kind = "remote branch";
 358                        what = rm->name + 13;
 359                }
 360                else {
 361                        kind = "";
 362                        what = rm->name;
 363                }
 364
 365                url_len = strlen(url);
 366                for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
 367                        ;
 368                url_len = i + 1;
 369                if (4 < i && !strncmp(".git", url + i - 3, 4))
 370                        url_len = i - 3;
 371
 372                note_len = 0;
 373                if (*what) {
 374                        if (*kind)
 375                                note_len += sprintf(note + note_len, "%s ",
 376                                                    kind);
 377                        note_len += sprintf(note + note_len, "'%s' of ", what);
 378                }
 379                note[note_len] = '\0';
 380                fprintf(fp, "%s\t%s\t%s",
 381                        sha1_to_hex(commit ? commit->object.sha1 :
 382                                    rm->old_sha1),
 383                        rm->merge ? "" : "not-for-merge",
 384                        note);
 385                for (i = 0; i < url_len; ++i)
 386                        if ('\n' == url[i])
 387                                fputs("\\n", fp);
 388                        else
 389                                fputc(url[i], fp);
 390                fputc('\n', fp);
 391
 392                if (ref) {
 393                        rc |= update_local_ref(ref, what, note);
 394                        free(ref);
 395                } else
 396                        sprintf(note, "* %-*s %-*s -> FETCH_HEAD",
 397                                TRANSPORT_SUMMARY_WIDTH, *kind ? kind : "branch",
 398                                 REFCOL_WIDTH, *what ? what : "HEAD");
 399                if (*note) {
 400                        if (verbosity >= 0 && !shown_url) {
 401                                fprintf(stderr, "From %.*s\n",
 402                                                url_len, url);
 403                                shown_url = 1;
 404                        }
 405                        if (verbosity >= 0)
 406                                fprintf(stderr, " %s\n", note);
 407                }
 408        }
 409        free(url);
 410        fclose(fp);
 411        if (rc & STORE_REF_ERROR_DF_CONFLICT)
 412                error("some local refs could not be updated; try running\n"
 413                      " 'git remote prune %s' to remove any old, conflicting "
 414                      "branches", remote_name);
 415        return rc;
 416}
 417
 418/*
 419 * We would want to bypass the object transfer altogether if
 420 * everything we are going to fetch already exists and is connected
 421 * locally.
 422 *
 423 * The refs we are going to fetch are in ref_map.  If running
 424 *
 425 *  $ git rev-list --objects --stdin --not --all
 426 *
 427 * (feeding all the refs in ref_map on its standard input)
 428 * does not error out, that means everything reachable from the
 429 * refs we are going to fetch exists and is connected to some of
 430 * our existing refs.
 431 */
 432static int quickfetch(struct ref *ref_map)
 433{
 434        struct child_process revlist;
 435        struct ref *ref;
 436        int err;
 437        const char *argv[] = {"rev-list",
 438                "--quiet", "--objects", "--stdin", "--not", "--all", NULL};
 439
 440        /*
 441         * If we are deepening a shallow clone we already have these
 442         * objects reachable.  Running rev-list here will return with
 443         * a good (0) exit status and we'll bypass the fetch that we
 444         * really need to perform.  Claiming failure now will ensure
 445         * we perform the network exchange to deepen our history.
 446         */
 447        if (depth)
 448                return -1;
 449
 450        if (!ref_map)
 451                return 0;
 452
 453        memset(&revlist, 0, sizeof(revlist));
 454        revlist.argv = argv;
 455        revlist.git_cmd = 1;
 456        revlist.no_stdout = 1;
 457        revlist.no_stderr = 1;
 458        revlist.in = -1;
 459
 460        err = start_command(&revlist);
 461        if (err) {
 462                error("could not run rev-list");
 463                return err;
 464        }
 465
 466        /*
 467         * If rev-list --stdin encounters an unknown commit, it terminates,
 468         * which will cause SIGPIPE in the write loop below.
 469         */
 470        sigchain_push(SIGPIPE, SIG_IGN);
 471
 472        for (ref = ref_map; ref; ref = ref->next) {
 473                if (write_in_full(revlist.in, sha1_to_hex(ref->old_sha1), 40) < 0 ||
 474                    write_str_in_full(revlist.in, "\n") < 0) {
 475                        if (errno != EPIPE && errno != EINVAL)
 476                                error("failed write to rev-list: %s", strerror(errno));
 477                        err = -1;
 478                        break;
 479                }
 480        }
 481
 482        if (close(revlist.in)) {
 483                error("failed to close rev-list's stdin: %s", strerror(errno));
 484                err = -1;
 485        }
 486
 487        sigchain_pop(SIGPIPE);
 488
 489        return finish_command(&revlist) || err;
 490}
 491
 492static int fetch_refs(struct transport *transport, struct ref *ref_map)
 493{
 494        int ret = quickfetch(ref_map);
 495        if (ret)
 496                ret = transport_fetch_refs(transport, ref_map);
 497        if (!ret)
 498                ret |= store_updated_refs(transport->url,
 499                                transport->remote->name,
 500                                ref_map);
 501        transport_unlock_pack(transport);
 502        return ret;
 503}
 504
 505static int prune_refs(struct transport *transport, struct ref *ref_map)
 506{
 507        int result = 0;
 508        struct ref *ref, *stale_refs = get_stale_heads(transport->remote, ref_map);
 509        const char *dangling_msg = dry_run
 510                ? "   (%s will become dangling)\n"
 511                : "   (%s has become dangling)\n";
 512
 513        for (ref = stale_refs; ref; ref = ref->next) {
 514                if (!dry_run)
 515                        result |= delete_ref(ref->name, NULL, 0);
 516                if (verbosity >= 0) {
 517                        fprintf(stderr, " x %-*s %-*s -> %s\n",
 518                                TRANSPORT_SUMMARY_WIDTH, "[deleted]",
 519                                REFCOL_WIDTH, "(none)", prettify_refname(ref->name));
 520                        warn_dangling_symref(stderr, dangling_msg, ref->name);
 521                }
 522        }
 523        free_refs(stale_refs);
 524        return result;
 525}
 526
 527static int add_existing(const char *refname, const unsigned char *sha1,
 528                        int flag, void *cbdata)
 529{
 530        struct string_list *list = (struct string_list *)cbdata;
 531        struct string_list_item *item = string_list_insert(list, refname);
 532        item->util = (void *)sha1;
 533        return 0;
 534}
 535
 536static int will_fetch(struct ref **head, const unsigned char *sha1)
 537{
 538        struct ref *rm = *head;
 539        while (rm) {
 540                if (!hashcmp(rm->old_sha1, sha1))
 541                        return 1;
 542                rm = rm->next;
 543        }
 544        return 0;
 545}
 546
 547struct tag_data {
 548        struct ref **head;
 549        struct ref ***tail;
 550};
 551
 552static int add_to_tail(struct string_list_item *item, void *cb_data)
 553{
 554        struct tag_data *data = (struct tag_data *)cb_data;
 555        struct ref *rm = NULL;
 556
 557        /* We have already decided to ignore this item */
 558        if (!item->util)
 559                return 0;
 560
 561        rm = alloc_ref(item->string);
 562        rm->peer_ref = alloc_ref(item->string);
 563        hashcpy(rm->old_sha1, item->util);
 564
 565        **data->tail = rm;
 566        *data->tail = &rm->next;
 567
 568        return 0;
 569}
 570
 571static void find_non_local_tags(struct transport *transport,
 572                        struct ref **head,
 573                        struct ref ***tail)
 574{
 575        struct string_list existing_refs = { NULL, 0, 0, 0 };
 576        struct string_list remote_refs = { NULL, 0, 0, 0 };
 577        struct tag_data data;
 578        const struct ref *ref;
 579        struct string_list_item *item = NULL;
 580        data.head = head; data.tail = tail;
 581
 582        for_each_ref(add_existing, &existing_refs);
 583        for (ref = transport_get_remote_refs(transport); ref; ref = ref->next) {
 584                if (prefixcmp(ref->name, "refs/tags"))
 585                        continue;
 586
 587                /*
 588                 * The peeled ref always follows the matching base
 589                 * ref, so if we see a peeled ref that we don't want
 590                 * to fetch then we can mark the ref entry in the list
 591                 * as one to ignore by setting util to NULL.
 592                 */
 593                if (!suffixcmp(ref->name, "^{}")) {
 594                        if (item && !has_sha1_file(ref->old_sha1) &&
 595                            !will_fetch(head, ref->old_sha1) &&
 596                            !has_sha1_file(item->util) &&
 597                            !will_fetch(head, item->util))
 598                                item->util = NULL;
 599                        item = NULL;
 600                        continue;
 601                }
 602
 603                /*
 604                 * If item is non-NULL here, then we previously saw a
 605                 * ref not followed by a peeled reference, so we need
 606                 * to check if it is a lightweight tag that we want to
 607                 * fetch.
 608                 */
 609                if (item && !has_sha1_file(item->util) &&
 610                    !will_fetch(head, item->util))
 611                        item->util = NULL;
 612
 613                item = NULL;
 614
 615                /* skip duplicates and refs that we already have */
 616                if (string_list_has_string(&remote_refs, ref->name) ||
 617                    string_list_has_string(&existing_refs, ref->name))
 618                        continue;
 619
 620                item = string_list_insert(&remote_refs, ref->name);
 621                item->util = (void *)ref->old_sha1;
 622        }
 623        string_list_clear(&existing_refs, 0);
 624
 625        /*
 626         * We may have a final lightweight tag that needs to be
 627         * checked to see if it needs fetching.
 628         */
 629        if (item && !has_sha1_file(item->util) &&
 630            !will_fetch(head, item->util))
 631                item->util = NULL;
 632
 633        /*
 634         * For all the tags in the remote_refs string list, call
 635         * add_to_tail to add them to the list of refs to be fetched
 636         */
 637        for_each_string_list(&remote_refs, add_to_tail, &data);
 638
 639        string_list_clear(&remote_refs, 0);
 640}
 641
 642static void check_not_current_branch(struct ref *ref_map)
 643{
 644        struct branch *current_branch = branch_get(NULL);
 645
 646        if (is_bare_repository() || !current_branch)
 647                return;
 648
 649        for (; ref_map; ref_map = ref_map->next)
 650                if (ref_map->peer_ref && !strcmp(current_branch->refname,
 651                                        ref_map->peer_ref->name))
 652                        die("Refusing to fetch into current branch %s "
 653                            "of non-bare repository", current_branch->refname);
 654}
 655
 656static int truncate_fetch_head(void)
 657{
 658        char *filename = git_path("FETCH_HEAD");
 659        FILE *fp = fopen(filename, "w");
 660
 661        if (!fp)
 662                return error("cannot open %s: %s\n", filename, strerror(errno));
 663        fclose(fp);
 664        return 0;
 665}
 666
 667static int do_fetch(struct transport *transport,
 668                    struct refspec *refs, int ref_count)
 669{
 670        struct string_list existing_refs = { NULL, 0, 0, 0 };
 671        struct string_list_item *peer_item = NULL;
 672        struct ref *ref_map;
 673        struct ref *rm;
 674        int autotags = (transport->remote->fetch_tags == 1);
 675
 676        for_each_ref(add_existing, &existing_refs);
 677
 678        if (transport->remote->fetch_tags == 2 && tags != TAGS_UNSET)
 679                tags = TAGS_SET;
 680        if (transport->remote->fetch_tags == -1)
 681                tags = TAGS_UNSET;
 682
 683        if (!transport->get_refs_list || !transport->fetch)
 684                die("Don't know how to fetch from %s", transport->url);
 685
 686        /* if not appending, truncate FETCH_HEAD */
 687        if (!append && !dry_run) {
 688                int errcode = truncate_fetch_head();
 689                if (errcode)
 690                        return errcode;
 691        }
 692
 693        ref_map = get_ref_map(transport, refs, ref_count, tags, &autotags);
 694        if (!update_head_ok)
 695                check_not_current_branch(ref_map);
 696
 697        for (rm = ref_map; rm; rm = rm->next) {
 698                if (rm->peer_ref) {
 699                        peer_item = string_list_lookup(&existing_refs,
 700                                                       rm->peer_ref->name);
 701                        if (peer_item)
 702                                hashcpy(rm->peer_ref->old_sha1,
 703                                        peer_item->util);
 704                }
 705        }
 706
 707        if (tags == TAGS_DEFAULT && autotags)
 708                transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
 709        if (fetch_refs(transport, ref_map)) {
 710                free_refs(ref_map);
 711                return 1;
 712        }
 713        if (prune)
 714                prune_refs(transport, ref_map);
 715        free_refs(ref_map);
 716
 717        /* if neither --no-tags nor --tags was specified, do automated tag
 718         * following ... */
 719        if (tags == TAGS_DEFAULT && autotags) {
 720                struct ref **tail = &ref_map;
 721                ref_map = NULL;
 722                find_non_local_tags(transport, &ref_map, &tail);
 723                if (ref_map) {
 724                        transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
 725                        transport_set_option(transport, TRANS_OPT_DEPTH, "0");
 726                        fetch_refs(transport, ref_map);
 727                }
 728                free_refs(ref_map);
 729        }
 730
 731        return 0;
 732}
 733
 734static void set_option(const char *name, const char *value)
 735{
 736        int r = transport_set_option(transport, name, value);
 737        if (r < 0)
 738                die("Option \"%s\" value \"%s\" is not valid for %s",
 739                        name, value, transport->url);
 740        if (r > 0)
 741                warning("Option \"%s\" is ignored for %s\n",
 742                        name, transport->url);
 743}
 744
 745static int get_one_remote_for_fetch(struct remote *remote, void *priv)
 746{
 747        struct string_list *list = priv;
 748        if (!remote->skip_default_update)
 749                string_list_append(list, remote->name);
 750        return 0;
 751}
 752
 753struct remote_group_data {
 754        const char *name;
 755        struct string_list *list;
 756};
 757
 758static int get_remote_group(const char *key, const char *value, void *priv)
 759{
 760        struct remote_group_data *g = priv;
 761
 762        if (!prefixcmp(key, "remotes.") &&
 763                        !strcmp(key + 8, g->name)) {
 764                /* split list by white space */
 765                int space = strcspn(value, " \t\n");
 766                while (*value) {
 767                        if (space > 1) {
 768                                string_list_append(g->list,
 769                                                   xstrndup(value, space));
 770                        }
 771                        value += space + (value[space] != '\0');
 772                        space = strcspn(value, " \t\n");
 773                }
 774        }
 775
 776        return 0;
 777}
 778
 779static int add_remote_or_group(const char *name, struct string_list *list)
 780{
 781        int prev_nr = list->nr;
 782        struct remote_group_data g;
 783        g.name = name; g.list = list;
 784
 785        git_config(get_remote_group, &g);
 786        if (list->nr == prev_nr) {
 787                struct remote *remote;
 788                if (!remote_is_configured(name))
 789                        return 0;
 790                remote = remote_get(name);
 791                string_list_append(list, remote->name);
 792        }
 793        return 1;
 794}
 795
 796static int fetch_multiple(struct string_list *list)
 797{
 798        int i, result = 0;
 799        const char *argv[11] = { "fetch", "--append" };
 800        int argc = 2;
 801
 802        if (dry_run)
 803                argv[argc++] = "--dry-run";
 804        if (prune)
 805                argv[argc++] = "--prune";
 806        if (update_head_ok)
 807                argv[argc++] = "--update-head-ok";
 808        if (force)
 809                argv[argc++] = "--force";
 810        if (keep)
 811                argv[argc++] = "--keep";
 812        if (verbosity >= 2)
 813                argv[argc++] = "-v";
 814        if (verbosity >= 1)
 815                argv[argc++] = "-v";
 816        else if (verbosity < 0)
 817                argv[argc++] = "-q";
 818
 819        if (!append && !dry_run) {
 820                int errcode = truncate_fetch_head();
 821                if (errcode)
 822                        return errcode;
 823        }
 824
 825        for (i = 0; i < list->nr; i++) {
 826                const char *name = list->items[i].string;
 827                argv[argc] = name;
 828                argv[argc + 1] = NULL;
 829                if (verbosity >= 0)
 830                        printf("Fetching %s\n", name);
 831                if (run_command_v_opt(argv, RUN_GIT_CMD)) {
 832                        error("Could not fetch %s", name);
 833                        result = 1;
 834                }
 835        }
 836
 837        return result;
 838}
 839
 840static int fetch_one(struct remote *remote, int argc, const char **argv)
 841{
 842        int i;
 843        static const char **refs = NULL;
 844        int ref_nr = 0;
 845        int exit_code;
 846
 847        if (!remote)
 848                die("Where do you want to fetch from today?");
 849
 850        transport = transport_get(remote, NULL);
 851        transport_set_verbosity(transport, verbosity, progress);
 852        if (upload_pack)
 853                set_option(TRANS_OPT_UPLOADPACK, upload_pack);
 854        if (keep)
 855                set_option(TRANS_OPT_KEEP, "yes");
 856        if (depth)
 857                set_option(TRANS_OPT_DEPTH, depth);
 858
 859        if (argc > 0) {
 860                int j = 0;
 861                refs = xcalloc(argc + 1, sizeof(const char *));
 862                for (i = 0; i < argc; i++) {
 863                        if (!strcmp(argv[i], "tag")) {
 864                                char *ref;
 865                                i++;
 866                                if (i >= argc)
 867                                        die("You need to specify a tag name.");
 868                                ref = xmalloc(strlen(argv[i]) * 2 + 22);
 869                                strcpy(ref, "refs/tags/");
 870                                strcat(ref, argv[i]);
 871                                strcat(ref, ":refs/tags/");
 872                                strcat(ref, argv[i]);
 873                                refs[j++] = ref;
 874                        } else
 875                                refs[j++] = argv[i];
 876                }
 877                refs[j] = NULL;
 878                ref_nr = j;
 879        }
 880
 881        sigchain_push_common(unlock_pack_on_signal);
 882        atexit(unlock_pack);
 883        exit_code = do_fetch(transport,
 884                        parse_fetch_refspec(ref_nr, refs), ref_nr);
 885        transport_disconnect(transport);
 886        transport = NULL;
 887        return exit_code;
 888}
 889
 890int cmd_fetch(int argc, const char **argv, const char *prefix)
 891{
 892        int i;
 893        struct string_list list = { NULL, 0, 0, 0 };
 894        struct remote *remote;
 895        int result = 0;
 896
 897        /* Record the command line for the reflog */
 898        strbuf_addstr(&default_rla, "fetch");
 899        for (i = 1; i < argc; i++)
 900                strbuf_addf(&default_rla, " %s", argv[i]);
 901
 902        argc = parse_options(argc, argv, prefix,
 903                             builtin_fetch_options, builtin_fetch_usage, 0);
 904
 905        if (all) {
 906                if (argc == 1)
 907                        die("fetch --all does not take a repository argument");
 908                else if (argc > 1)
 909                        die("fetch --all does not make sense with refspecs");
 910                (void) for_each_remote(get_one_remote_for_fetch, &list);
 911                result = fetch_multiple(&list);
 912        } else if (argc == 0) {
 913                /* No arguments -- use default remote */
 914                remote = remote_get(NULL);
 915                result = fetch_one(remote, argc, argv);
 916        } else if (multiple) {
 917                /* All arguments are assumed to be remotes or groups */
 918                for (i = 0; i < argc; i++)
 919                        if (!add_remote_or_group(argv[i], &list))
 920                                die("No such remote or remote group: %s", argv[i]);
 921                result = fetch_multiple(&list);
 922        } else {
 923                /* Single remote or group */
 924                (void) add_remote_or_group(argv[0], &list);
 925                if (list.nr > 1) {
 926                        /* More than one remote */
 927                        if (argc > 1)
 928                                die("Fetching a group and specifying refspecs does not make sense");
 929                        result = fetch_multiple(&list);
 930                } else {
 931                        /* Zero or one remotes */
 932                        remote = remote_get(argv[0]);
 933                        result = fetch_one(remote, argc-1, argv+1);
 934                }
 935        }
 936
 937        /* All names were strdup()ed or strndup()ed */
 938        list.strdup_strings = 1;
 939        string_list_clear(&list, 0);
 940
 941        return result;
 942}