upload-pack.con commit range_set: fix coalescing bug when range is a subset of another (3755b53)
   1#include "cache.h"
   2#include "refs.h"
   3#include "pkt-line.h"
   4#include "sideband.h"
   5#include "tag.h"
   6#include "object.h"
   7#include "commit.h"
   8#include "exec_cmd.h"
   9#include "diff.h"
  10#include "revision.h"
  11#include "list-objects.h"
  12#include "run-command.h"
  13#include "sigchain.h"
  14#include "version.h"
  15#include "string-list.h"
  16
  17static const char upload_pack_usage[] = "git upload-pack [--strict] [--timeout=<n>] <dir>";
  18
  19/* bits #0..7 in revision.h, #8..10 in commit.c */
  20#define THEY_HAVE       (1u << 11)
  21#define OUR_REF         (1u << 12)
  22#define WANTED          (1u << 13)
  23#define COMMON_KNOWN    (1u << 14)
  24#define REACHABLE       (1u << 15)
  25
  26#define SHALLOW         (1u << 16)
  27#define NOT_SHALLOW     (1u << 17)
  28#define CLIENT_SHALLOW  (1u << 18)
  29
  30static unsigned long oldest_have;
  31
  32static int multi_ack;
  33static int no_done;
  34static int use_thin_pack, use_ofs_delta, use_include_tag;
  35static int no_progress, daemon_mode;
  36static int shallow_nr;
  37static struct object_array have_obj;
  38static struct object_array want_obj;
  39static struct object_array extra_edge_obj;
  40static unsigned int timeout;
  41/* 0 for no sideband,
  42 * otherwise maximum packet size (up to 65520 bytes).
  43 */
  44static int use_sideband;
  45static int debug_fd;
  46static int advertise_refs;
  47static int stateless_rpc;
  48
  49static void reset_timeout(void)
  50{
  51        alarm(timeout);
  52}
  53
  54static int strip(char *line, int len)
  55{
  56        if (len && line[len-1] == '\n')
  57                line[--len] = 0;
  58        return len;
  59}
  60
  61static ssize_t send_client_data(int fd, const char *data, ssize_t sz)
  62{
  63        if (use_sideband)
  64                return send_sideband(1, fd, data, sz, use_sideband);
  65        if (fd == 3)
  66                /* emergency quit */
  67                fd = 2;
  68        if (fd == 2) {
  69                /* XXX: are we happy to lose stuff here? */
  70                xwrite(fd, data, sz);
  71                return sz;
  72        }
  73        return safe_write(fd, data, sz);
  74}
  75
  76static FILE *pack_pipe = NULL;
  77static void show_commit(struct commit *commit, void *data)
  78{
  79        if (commit->object.flags & BOUNDARY)
  80                fputc('-', pack_pipe);
  81        if (fputs(sha1_to_hex(commit->object.sha1), pack_pipe) < 0)
  82                die("broken output pipe");
  83        fputc('\n', pack_pipe);
  84        fflush(pack_pipe);
  85        free(commit->buffer);
  86        commit->buffer = NULL;
  87}
  88
  89static void show_object(struct object *obj,
  90                        const struct name_path *path, const char *component,
  91                        void *cb_data)
  92{
  93        show_object_with_name(pack_pipe, obj, path, component);
  94}
  95
  96static void show_edge(struct commit *commit)
  97{
  98        fprintf(pack_pipe, "-%s\n", sha1_to_hex(commit->object.sha1));
  99}
 100
 101static int do_rev_list(int in, int out, void *user_data)
 102{
 103        int i;
 104        struct rev_info revs;
 105
 106        pack_pipe = xfdopen(out, "w");
 107        init_revisions(&revs, NULL);
 108        revs.tag_objects = 1;
 109        revs.tree_objects = 1;
 110        revs.blob_objects = 1;
 111        if (use_thin_pack)
 112                revs.edge_hint = 1;
 113
 114        for (i = 0; i < want_obj.nr; i++) {
 115                struct object *o = want_obj.objects[i].item;
 116                /* why??? */
 117                o->flags &= ~UNINTERESTING;
 118                add_pending_object(&revs, o, NULL);
 119        }
 120        for (i = 0; i < have_obj.nr; i++) {
 121                struct object *o = have_obj.objects[i].item;
 122                o->flags |= UNINTERESTING;
 123                add_pending_object(&revs, o, NULL);
 124        }
 125        setup_revisions(0, NULL, &revs, NULL);
 126        if (prepare_revision_walk(&revs))
 127                die("revision walk setup failed");
 128        mark_edges_uninteresting(revs.commits, &revs, show_edge);
 129        if (use_thin_pack)
 130                for (i = 0; i < extra_edge_obj.nr; i++)
 131                        fprintf(pack_pipe, "-%s\n", sha1_to_hex(
 132                                        extra_edge_obj.objects[i].item->sha1));
 133        traverse_commit_list(&revs, show_commit, show_object, NULL);
 134        fflush(pack_pipe);
 135        fclose(pack_pipe);
 136        return 0;
 137}
 138
 139static void create_pack_file(void)
 140{
 141        struct async rev_list;
 142        struct child_process pack_objects;
 143        char data[8193], progress[128];
 144        char abort_msg[] = "aborting due to possible repository "
 145                "corruption on the remote side.";
 146        int buffered = -1;
 147        ssize_t sz;
 148        const char *argv[10];
 149        int arg = 0;
 150
 151        argv[arg++] = "pack-objects";
 152        if (!shallow_nr) {
 153                argv[arg++] = "--revs";
 154                if (use_thin_pack)
 155                        argv[arg++] = "--thin";
 156        }
 157
 158        argv[arg++] = "--stdout";
 159        if (!no_progress)
 160                argv[arg++] = "--progress";
 161        if (use_ofs_delta)
 162                argv[arg++] = "--delta-base-offset";
 163        if (use_include_tag)
 164                argv[arg++] = "--include-tag";
 165        argv[arg++] = NULL;
 166
 167        memset(&pack_objects, 0, sizeof(pack_objects));
 168        pack_objects.in = -1;
 169        pack_objects.out = -1;
 170        pack_objects.err = -1;
 171        pack_objects.git_cmd = 1;
 172        pack_objects.argv = argv;
 173
 174        if (start_command(&pack_objects))
 175                die("git upload-pack: unable to fork git-pack-objects");
 176
 177        if (shallow_nr) {
 178                memset(&rev_list, 0, sizeof(rev_list));
 179                rev_list.proc = do_rev_list;
 180                rev_list.out = pack_objects.in;
 181                if (start_async(&rev_list))
 182                        die("git upload-pack: unable to fork git-rev-list");
 183        }
 184        else {
 185                FILE *pipe_fd = xfdopen(pack_objects.in, "w");
 186                int i;
 187
 188                for (i = 0; i < want_obj.nr; i++)
 189                        fprintf(pipe_fd, "%s\n",
 190                                sha1_to_hex(want_obj.objects[i].item->sha1));
 191                fprintf(pipe_fd, "--not\n");
 192                for (i = 0; i < have_obj.nr; i++)
 193                        fprintf(pipe_fd, "%s\n",
 194                                sha1_to_hex(have_obj.objects[i].item->sha1));
 195                fprintf(pipe_fd, "\n");
 196                fflush(pipe_fd);
 197                fclose(pipe_fd);
 198        }
 199
 200
 201        /* We read from pack_objects.err to capture stderr output for
 202         * progress bar, and pack_objects.out to capture the pack data.
 203         */
 204
 205        while (1) {
 206                struct pollfd pfd[2];
 207                int pe, pu, pollsize;
 208
 209                reset_timeout();
 210
 211                pollsize = 0;
 212                pe = pu = -1;
 213
 214                if (0 <= pack_objects.out) {
 215                        pfd[pollsize].fd = pack_objects.out;
 216                        pfd[pollsize].events = POLLIN;
 217                        pu = pollsize;
 218                        pollsize++;
 219                }
 220                if (0 <= pack_objects.err) {
 221                        pfd[pollsize].fd = pack_objects.err;
 222                        pfd[pollsize].events = POLLIN;
 223                        pe = pollsize;
 224                        pollsize++;
 225                }
 226
 227                if (!pollsize)
 228                        break;
 229
 230                if (poll(pfd, pollsize, -1) < 0) {
 231                        if (errno != EINTR) {
 232                                error("poll failed, resuming: %s",
 233                                      strerror(errno));
 234                                sleep(1);
 235                        }
 236                        continue;
 237                }
 238                if (0 <= pe && (pfd[pe].revents & (POLLIN|POLLHUP))) {
 239                        /* Status ready; we ship that in the side-band
 240                         * or dump to the standard error.
 241                         */
 242                        sz = xread(pack_objects.err, progress,
 243                                  sizeof(progress));
 244                        if (0 < sz)
 245                                send_client_data(2, progress, sz);
 246                        else if (sz == 0) {
 247                                close(pack_objects.err);
 248                                pack_objects.err = -1;
 249                        }
 250                        else
 251                                goto fail;
 252                        /* give priority to status messages */
 253                        continue;
 254                }
 255                if (0 <= pu && (pfd[pu].revents & (POLLIN|POLLHUP))) {
 256                        /* Data ready; we keep the last byte to ourselves
 257                         * in case we detect broken rev-list, so that we
 258                         * can leave the stream corrupted.  This is
 259                         * unfortunate -- unpack-objects would happily
 260                         * accept a valid packdata with trailing garbage,
 261                         * so appending garbage after we pass all the
 262                         * pack data is not good enough to signal
 263                         * breakage to downstream.
 264                         */
 265                        char *cp = data;
 266                        ssize_t outsz = 0;
 267                        if (0 <= buffered) {
 268                                *cp++ = buffered;
 269                                outsz++;
 270                        }
 271                        sz = xread(pack_objects.out, cp,
 272                                  sizeof(data) - outsz);
 273                        if (0 < sz)
 274                                ;
 275                        else if (sz == 0) {
 276                                close(pack_objects.out);
 277                                pack_objects.out = -1;
 278                        }
 279                        else
 280                                goto fail;
 281                        sz += outsz;
 282                        if (1 < sz) {
 283                                buffered = data[sz-1] & 0xFF;
 284                                sz--;
 285                        }
 286                        else
 287                                buffered = -1;
 288                        sz = send_client_data(1, data, sz);
 289                        if (sz < 0)
 290                                goto fail;
 291                }
 292        }
 293
 294        if (finish_command(&pack_objects)) {
 295                error("git upload-pack: git-pack-objects died with error.");
 296                goto fail;
 297        }
 298        if (shallow_nr && finish_async(&rev_list))
 299                goto fail;      /* error was already reported */
 300
 301        /* flush the data */
 302        if (0 <= buffered) {
 303                data[0] = buffered;
 304                sz = send_client_data(1, data, 1);
 305                if (sz < 0)
 306                        goto fail;
 307                fprintf(stderr, "flushed.\n");
 308        }
 309        if (use_sideband)
 310                packet_flush(1);
 311        return;
 312
 313 fail:
 314        send_client_data(3, abort_msg, sizeof(abort_msg));
 315        die("git upload-pack: %s", abort_msg);
 316}
 317
 318static int got_sha1(char *hex, unsigned char *sha1)
 319{
 320        struct object *o;
 321        int we_knew_they_have = 0;
 322
 323        if (get_sha1_hex(hex, sha1))
 324                die("git upload-pack: expected SHA1 object, got '%s'", hex);
 325        if (!has_sha1_file(sha1))
 326                return -1;
 327
 328        o = lookup_object(sha1);
 329        if (!(o && o->parsed))
 330                o = parse_object(sha1);
 331        if (!o)
 332                die("oops (%s)", sha1_to_hex(sha1));
 333        if (o->type == OBJ_COMMIT) {
 334                struct commit_list *parents;
 335                struct commit *commit = (struct commit *)o;
 336                if (o->flags & THEY_HAVE)
 337                        we_knew_they_have = 1;
 338                else
 339                        o->flags |= THEY_HAVE;
 340                if (!oldest_have || (commit->date < oldest_have))
 341                        oldest_have = commit->date;
 342                for (parents = commit->parents;
 343                     parents;
 344                     parents = parents->next)
 345                        parents->item->object.flags |= THEY_HAVE;
 346        }
 347        if (!we_knew_they_have) {
 348                add_object_array(o, NULL, &have_obj);
 349                return 1;
 350        }
 351        return 0;
 352}
 353
 354static int reachable(struct commit *want)
 355{
 356        struct commit_list *work = NULL;
 357
 358        commit_list_insert_by_date(want, &work);
 359        while (work) {
 360                struct commit_list *list = work->next;
 361                struct commit *commit = work->item;
 362                free(work);
 363                work = list;
 364
 365                if (commit->object.flags & THEY_HAVE) {
 366                        want->object.flags |= COMMON_KNOWN;
 367                        break;
 368                }
 369                if (!commit->object.parsed)
 370                        parse_object(commit->object.sha1);
 371                if (commit->object.flags & REACHABLE)
 372                        continue;
 373                commit->object.flags |= REACHABLE;
 374                if (commit->date < oldest_have)
 375                        continue;
 376                for (list = commit->parents; list; list = list->next) {
 377                        struct commit *parent = list->item;
 378                        if (!(parent->object.flags & REACHABLE))
 379                                commit_list_insert_by_date(parent, &work);
 380                }
 381        }
 382        want->object.flags |= REACHABLE;
 383        clear_commit_marks(want, REACHABLE);
 384        free_commit_list(work);
 385        return (want->object.flags & COMMON_KNOWN);
 386}
 387
 388static int ok_to_give_up(void)
 389{
 390        int i;
 391
 392        if (!have_obj.nr)
 393                return 0;
 394
 395        for (i = 0; i < want_obj.nr; i++) {
 396                struct object *want = want_obj.objects[i].item;
 397
 398                if (want->flags & COMMON_KNOWN)
 399                        continue;
 400                want = deref_tag(want, "a want line", 0);
 401                if (!want || want->type != OBJ_COMMIT) {
 402                        /* no way to tell if this is reachable by
 403                         * looking at the ancestry chain alone, so
 404                         * leave a note to ourselves not to worry about
 405                         * this object anymore.
 406                         */
 407                        want_obj.objects[i].item->flags |= COMMON_KNOWN;
 408                        continue;
 409                }
 410                if (!reachable((struct commit *)want))
 411                        return 0;
 412        }
 413        return 1;
 414}
 415
 416static int get_common_commits(void)
 417{
 418        static char line[1000];
 419        unsigned char sha1[20];
 420        char last_hex[41];
 421        int got_common = 0;
 422        int got_other = 0;
 423        int sent_ready = 0;
 424
 425        save_commit_buffer = 0;
 426
 427        for (;;) {
 428                int len = packet_read_line(0, line, sizeof(line));
 429                reset_timeout();
 430
 431                if (!len) {
 432                        if (multi_ack == 2 && got_common
 433                            && !got_other && ok_to_give_up()) {
 434                                sent_ready = 1;
 435                                packet_write(1, "ACK %s ready\n", last_hex);
 436                        }
 437                        if (have_obj.nr == 0 || multi_ack)
 438                                packet_write(1, "NAK\n");
 439
 440                        if (no_done && sent_ready) {
 441                                packet_write(1, "ACK %s\n", last_hex);
 442                                return 0;
 443                        }
 444                        if (stateless_rpc)
 445                                exit(0);
 446                        got_common = 0;
 447                        got_other = 0;
 448                        continue;
 449                }
 450                strip(line, len);
 451                if (!prefixcmp(line, "have ")) {
 452                        switch (got_sha1(line+5, sha1)) {
 453                        case -1: /* they have what we do not */
 454                                got_other = 1;
 455                                if (multi_ack && ok_to_give_up()) {
 456                                        const char *hex = sha1_to_hex(sha1);
 457                                        if (multi_ack == 2) {
 458                                                sent_ready = 1;
 459                                                packet_write(1, "ACK %s ready\n", hex);
 460                                        } else
 461                                                packet_write(1, "ACK %s continue\n", hex);
 462                                }
 463                                break;
 464                        default:
 465                                got_common = 1;
 466                                memcpy(last_hex, sha1_to_hex(sha1), 41);
 467                                if (multi_ack == 2)
 468                                        packet_write(1, "ACK %s common\n", last_hex);
 469                                else if (multi_ack)
 470                                        packet_write(1, "ACK %s continue\n", last_hex);
 471                                else if (have_obj.nr == 1)
 472                                        packet_write(1, "ACK %s\n", last_hex);
 473                                break;
 474                        }
 475                        continue;
 476                }
 477                if (!strcmp(line, "done")) {
 478                        if (have_obj.nr > 0) {
 479                                if (multi_ack)
 480                                        packet_write(1, "ACK %s\n", last_hex);
 481                                return 0;
 482                        }
 483                        packet_write(1, "NAK\n");
 484                        return -1;
 485                }
 486                die("git upload-pack: expected SHA1 list, got '%s'", line);
 487        }
 488}
 489
 490static void check_non_tip(void)
 491{
 492        static const char *argv[] = {
 493                "rev-list", "--stdin", NULL,
 494        };
 495        static struct child_process cmd;
 496        struct object *o;
 497        char namebuf[42]; /* ^ + SHA-1 + LF */
 498        int i;
 499
 500        /* In the normal in-process case non-tip request can never happen */
 501        if (!stateless_rpc)
 502                goto error;
 503
 504        cmd.argv = argv;
 505        cmd.git_cmd = 1;
 506        cmd.no_stderr = 1;
 507        cmd.in = -1;
 508        cmd.out = -1;
 509
 510        if (start_command(&cmd))
 511                goto error;
 512
 513        /*
 514         * If rev-list --stdin encounters an unknown commit, it
 515         * terminates, which will cause SIGPIPE in the write loop
 516         * below.
 517         */
 518        sigchain_push(SIGPIPE, SIG_IGN);
 519
 520        namebuf[0] = '^';
 521        namebuf[41] = '\n';
 522        for (i = get_max_object_index(); 0 < i; ) {
 523                o = get_indexed_object(--i);
 524                if (!o)
 525                        continue;
 526                if (!(o->flags & OUR_REF))
 527                        continue;
 528                memcpy(namebuf + 1, sha1_to_hex(o->sha1), 40);
 529                if (write_in_full(cmd.in, namebuf, 42) < 0)
 530                        goto error;
 531        }
 532        namebuf[40] = '\n';
 533        for (i = 0; i < want_obj.nr; i++) {
 534                o = want_obj.objects[i].item;
 535                if (o->flags & OUR_REF)
 536                        continue;
 537                memcpy(namebuf, sha1_to_hex(o->sha1), 40);
 538                if (write_in_full(cmd.in, namebuf, 41) < 0)
 539                        goto error;
 540        }
 541        close(cmd.in);
 542
 543        sigchain_pop(SIGPIPE);
 544
 545        /*
 546         * The commits out of the rev-list are not ancestors of
 547         * our ref.
 548         */
 549        i = read_in_full(cmd.out, namebuf, 1);
 550        if (i)
 551                goto error;
 552        close(cmd.out);
 553
 554        /*
 555         * rev-list may have died by encountering a bad commit
 556         * in the history, in which case we do want to bail out
 557         * even when it showed no commit.
 558         */
 559        if (finish_command(&cmd))
 560                goto error;
 561
 562        /* All the non-tip ones are ancestors of what we advertised */
 563        return;
 564
 565error:
 566        /* Pick one of them (we know there at least is one) */
 567        for (i = 0; i < want_obj.nr; i++) {
 568                o = want_obj.objects[i].item;
 569                if (!(o->flags & OUR_REF))
 570                        die("git upload-pack: not our ref %s",
 571                            sha1_to_hex(o->sha1));
 572        }
 573}
 574
 575static void receive_needs(void)
 576{
 577        struct object_array shallows = OBJECT_ARRAY_INIT;
 578        static char line[1000];
 579        int len, depth = 0;
 580        int has_non_tip = 0;
 581
 582        shallow_nr = 0;
 583        if (debug_fd)
 584                write_str_in_full(debug_fd, "#S\n");
 585        for (;;) {
 586                struct object *o;
 587                const char *features;
 588                unsigned char sha1_buf[20];
 589                len = packet_read_line(0, line, sizeof(line));
 590                reset_timeout();
 591                if (!len)
 592                        break;
 593                if (debug_fd)
 594                        write_in_full(debug_fd, line, len);
 595
 596                if (!prefixcmp(line, "shallow ")) {
 597                        unsigned char sha1[20];
 598                        struct object *object;
 599                        if (get_sha1(line + 8, sha1))
 600                                die("invalid shallow line: %s", line);
 601                        object = parse_object(sha1);
 602                        if (!object)
 603                                die("did not find object for %s", line);
 604                        if (object->type != OBJ_COMMIT)
 605                                die("invalid shallow object %s", sha1_to_hex(sha1));
 606                        object->flags |= CLIENT_SHALLOW;
 607                        add_object_array(object, NULL, &shallows);
 608                        continue;
 609                }
 610                if (!prefixcmp(line, "deepen ")) {
 611                        char *end;
 612                        depth = strtol(line + 7, &end, 0);
 613                        if (end == line + 7 || depth <= 0)
 614                                die("Invalid deepen: %s", line);
 615                        continue;
 616                }
 617                if (prefixcmp(line, "want ") ||
 618                    get_sha1_hex(line+5, sha1_buf))
 619                        die("git upload-pack: protocol error, "
 620                            "expected to get sha, not '%s'", line);
 621
 622                features = line + 45;
 623
 624                if (parse_feature_request(features, "multi_ack_detailed"))
 625                        multi_ack = 2;
 626                else if (parse_feature_request(features, "multi_ack"))
 627                        multi_ack = 1;
 628                if (parse_feature_request(features, "no-done"))
 629                        no_done = 1;
 630                if (parse_feature_request(features, "thin-pack"))
 631                        use_thin_pack = 1;
 632                if (parse_feature_request(features, "ofs-delta"))
 633                        use_ofs_delta = 1;
 634                if (parse_feature_request(features, "side-band-64k"))
 635                        use_sideband = LARGE_PACKET_MAX;
 636                else if (parse_feature_request(features, "side-band"))
 637                        use_sideband = DEFAULT_PACKET_MAX;
 638                if (parse_feature_request(features, "no-progress"))
 639                        no_progress = 1;
 640                if (parse_feature_request(features, "include-tag"))
 641                        use_include_tag = 1;
 642
 643                o = lookup_object(sha1_buf);
 644                if (!o)
 645                        die("git upload-pack: not our ref %s",
 646                            sha1_to_hex(sha1_buf));
 647                if (!(o->flags & WANTED)) {
 648                        o->flags |= WANTED;
 649                        if (!(o->flags & OUR_REF))
 650                                has_non_tip = 1;
 651                        add_object_array(o, NULL, &want_obj);
 652                }
 653        }
 654        if (debug_fd)
 655                write_str_in_full(debug_fd, "#E\n");
 656
 657        /*
 658         * We have sent all our refs already, and the other end
 659         * should have chosen out of them. When we are operating
 660         * in the stateless RPC mode, however, their choice may
 661         * have been based on the set of older refs advertised
 662         * by another process that handled the initial request.
 663         */
 664        if (has_non_tip)
 665                check_non_tip();
 666
 667        if (!use_sideband && daemon_mode)
 668                no_progress = 1;
 669
 670        if (depth == 0 && shallows.nr == 0)
 671                return;
 672        if (depth > 0) {
 673                struct commit_list *result = NULL, *backup = NULL;
 674                int i;
 675                if (depth == INFINITE_DEPTH)
 676                        for (i = 0; i < shallows.nr; i++) {
 677                                struct object *object = shallows.objects[i].item;
 678                                object->flags |= NOT_SHALLOW;
 679                        }
 680                else
 681                        backup = result =
 682                                get_shallow_commits(&want_obj, depth,
 683                                                    SHALLOW, NOT_SHALLOW);
 684                while (result) {
 685                        struct object *object = &result->item->object;
 686                        if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) {
 687                                packet_write(1, "shallow %s",
 688                                                sha1_to_hex(object->sha1));
 689                                register_shallow(object->sha1);
 690                                shallow_nr++;
 691                        }
 692                        result = result->next;
 693                }
 694                free_commit_list(backup);
 695                for (i = 0; i < shallows.nr; i++) {
 696                        struct object *object = shallows.objects[i].item;
 697                        if (object->flags & NOT_SHALLOW) {
 698                                struct commit_list *parents;
 699                                packet_write(1, "unshallow %s",
 700                                        sha1_to_hex(object->sha1));
 701                                object->flags &= ~CLIENT_SHALLOW;
 702                                /* make sure the real parents are parsed */
 703                                unregister_shallow(object->sha1);
 704                                object->parsed = 0;
 705                                if (parse_commit((struct commit *)object))
 706                                        die("invalid commit");
 707                                parents = ((struct commit *)object)->parents;
 708                                while (parents) {
 709                                        add_object_array(&parents->item->object,
 710                                                        NULL, &want_obj);
 711                                        parents = parents->next;
 712                                }
 713                                add_object_array(object, NULL, &extra_edge_obj);
 714                        }
 715                        /* make sure commit traversal conforms to client */
 716                        register_shallow(object->sha1);
 717                }
 718                packet_flush(1);
 719        } else
 720                if (shallows.nr > 0) {
 721                        int i;
 722                        for (i = 0; i < shallows.nr; i++)
 723                                register_shallow(shallows.objects[i].item->sha1);
 724                }
 725
 726        shallow_nr += shallows.nr;
 727        free(shallows.objects);
 728}
 729
 730/* return non-zero if the ref is hidden, otherwise 0 */
 731static int mark_our_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
 732{
 733        struct object *o = lookup_unknown_object(sha1);
 734
 735        if (ref_is_hidden(refname))
 736                return 1;
 737        if (!o)
 738                die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1));
 739        o->flags |= OUR_REF;
 740        return 0;
 741}
 742
 743static int send_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
 744{
 745        static const char *capabilities = "multi_ack thin-pack side-band"
 746                " side-band-64k ofs-delta shallow no-progress"
 747                " include-tag multi_ack_detailed";
 748        const char *refname_nons = strip_namespace(refname);
 749        unsigned char peeled[20];
 750
 751        if (mark_our_ref(refname, sha1, flag, cb_data))
 752                return 0;
 753
 754        if (capabilities)
 755                packet_write(1, "%s %s%c%s%s agent=%s\n",
 756                             sha1_to_hex(sha1), refname_nons,
 757                             0, capabilities,
 758                             stateless_rpc ? " no-done" : "",
 759                             git_user_agent_sanitized());
 760        else
 761                packet_write(1, "%s %s\n", sha1_to_hex(sha1), refname_nons);
 762        capabilities = NULL;
 763        if (!peel_ref(refname, peeled))
 764                packet_write(1, "%s %s^{}\n", sha1_to_hex(peeled), refname_nons);
 765        return 0;
 766}
 767
 768static void upload_pack(void)
 769{
 770        if (advertise_refs || !stateless_rpc) {
 771                reset_timeout();
 772                head_ref_namespaced(send_ref, NULL);
 773                for_each_namespaced_ref(send_ref, NULL);
 774                packet_flush(1);
 775        } else {
 776                head_ref_namespaced(mark_our_ref, NULL);
 777                for_each_namespaced_ref(mark_our_ref, NULL);
 778        }
 779        if (advertise_refs)
 780                return;
 781
 782        receive_needs();
 783        if (want_obj.nr) {
 784                get_common_commits();
 785                create_pack_file();
 786        }
 787}
 788
 789static int upload_pack_config(const char *var, const char *value, void *unused)
 790{
 791        return parse_hide_refs_config(var, value, "uploadpack");
 792}
 793
 794int main(int argc, char **argv)
 795{
 796        char *dir;
 797        int i;
 798        int strict = 0;
 799
 800        git_setup_gettext();
 801
 802        packet_trace_identity("upload-pack");
 803        git_extract_argv0_path(argv[0]);
 804        read_replace_refs = 0;
 805
 806        for (i = 1; i < argc; i++) {
 807                char *arg = argv[i];
 808
 809                if (arg[0] != '-')
 810                        break;
 811                if (!strcmp(arg, "--advertise-refs")) {
 812                        advertise_refs = 1;
 813                        continue;
 814                }
 815                if (!strcmp(arg, "--stateless-rpc")) {
 816                        stateless_rpc = 1;
 817                        continue;
 818                }
 819                if (!strcmp(arg, "--strict")) {
 820                        strict = 1;
 821                        continue;
 822                }
 823                if (!prefixcmp(arg, "--timeout=")) {
 824                        timeout = atoi(arg+10);
 825                        daemon_mode = 1;
 826                        continue;
 827                }
 828                if (!strcmp(arg, "--")) {
 829                        i++;
 830                        break;
 831                }
 832        }
 833
 834        if (i != argc-1)
 835                usage(upload_pack_usage);
 836
 837        setup_path();
 838
 839        dir = argv[i];
 840
 841        if (!enter_repo(dir, strict))
 842                die("'%s' does not appear to be a git repository", dir);
 843        if (is_repository_shallow())
 844                die("attempt to fetch/clone from a shallow repository");
 845        git_config(upload_pack_config, NULL);
 846        if (getenv("GIT_DEBUG_SEND_PACK"))
 847                debug_fd = atoi(getenv("GIT_DEBUG_SEND_PACK"));
 848        upload_pack();
 849        return 0;
 850}