upload-pack.c

   1 #include "cache.h"
   2 #include "config.h"
   3 #include "refs.h"
   4 #include "pkt-line.h"
   5 #include "sideband.h"
   6 #include "repository.h"
   7 #include "object-store.h"
   8 #include "tag.h"
   9 #include "object.h"
  10 #include "commit.h"
  11 #include "diff.h"
  12 #include "revision.h"
  13 #include "list-objects.h"
  14 #include "list-objects-filter.h"
  15 #include "list-objects-filter-options.h"
  16 #include "run-command.h"
  17 #include "connect.h"
  18 #include "sigchain.h"
  19 #include "version.h"
  20 #include "string-list.h"
  21 #include "argv-array.h"
  22 #include "prio-queue.h"
  23 #include "protocol.h"
  24 #include "quote.h"
  25 #include "upload-pack.h"
  26 #include "serve.h"
  27 #include "commit-graph.h"
  28 #include "commit-reach.h"
  29 #include "shallow.h"
  30
  31 /* Remember to update object flag allocation in object.h */
  32 #define THEY_HAVE       (1u << 11)
  33 #define OUR_REF         (1u << 12)
  34 #define WANTED          (1u << 13)
  35 #define COMMON_KNOWN    (1u << 14)
  36
  37 #define SHALLOW         (1u << 16)
  38 #define NOT_SHALLOW     (1u << 17)
  39 #define CLIENT_SHALLOW  (1u << 18)
  40 #define HIDDEN_REF      (1u << 19)
  41
  42 #define ALL_FLAGS (THEY_HAVE | OUR_REF | WANTED | COMMON_KNOWN | SHALLOW | \
  43                 NOT_SHALLOW | CLIENT_SHALLOW | HIDDEN_REF)
  44
  45 static timestamp_t oldest_have;
  46
  47 static int multi_ack;
  48 static int no_done;
  49 static int use_thin_pack, use_ofs_delta, use_include_tag;
  50 static int no_progress, daemon_mode;
  51 /* Allow specifying sha1 if it is a ref tip. */
  52 #define ALLOW_TIP_SHA1  01
  53 /* Allow request of a sha1 if it is reachable from a ref (possibly hidden ref). */
  54 #define ALLOW_REACHABLE_SHA1    02
  55 /* Allow request of any sha1. Implies ALLOW_TIP_SHA1 and ALLOW_REACHABLE_SHA1. */
  56 #define ALLOW_ANY_SHA1  07
  57 static unsigned int allow_unadvertised_object_request;
  58 static int shallow_nr;
  59 static struct object_array extra_edge_obj;
  60 static unsigned int timeout;
  61 static int keepalive = 5;
  62 /* 0 for no sideband,
  63  * otherwise maximum packet size (up to 65520 bytes).
  64  */
  65 static int use_sideband;
  66 static int stateless_rpc;
  67 static const char *pack_objects_hook;
  68
  69 static int filter_capability_requested;
  70 static int allow_filter;
  71 static int allow_ref_in_want;
  72
  73 static int allow_sideband_all;
  74
  75 static void reset_timeout(void)
  76 {
  77         alarm(timeout);
  78 }
  79
  80 static void send_client_data(int fd, const char *data, ssize_t sz)
  81 {
  82         if (use_sideband) {
  83                 send_sideband(1, fd, data, sz, use_sideband);
  84                 return;
  85         }
  86         if (fd == 3)
  87                 /* emergency quit */
  88                 fd = 2;
  89         if (fd == 2) {
  90                 /* XXX: are we happy to lose stuff here? */
  91                 xwrite(fd, data, sz);
  92                 return;
  93         }
  94         write_or_die(fd, data, sz);
  95 }
  96
  97 static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
  98 {
  99         FILE *fp = cb_data;
 100         if (graft->nr_parent == -1)
 101                 fprintf(fp, "--shallow %s\n", oid_to_hex(&graft->oid));
 102         return 0;
 103 }
 104
 105 static void create_pack_file(const struct object_array *have_obj,
 106                              const struct object_array *want_obj,
 107                              struct list_objects_filter_options *filter_options)
 108 {
 109         struct child_process pack_objects = CHILD_PROCESS_INIT;
 110         char data[8193], progress[128];
 111         char abort_msg[] = "aborting due to possible repository "
 112                 "corruption on the remote side.";
 113         int buffered = -1;
 114         ssize_t sz;
 115         int i;
 116         FILE *pipe_fd;
 117
 118         if (!pack_objects_hook)
 119                 pack_objects.git_cmd = 1;
 120         else {
 121                 argv_array_push(&pack_objects.args, pack_objects_hook);
 122                 argv_array_push(&pack_objects.args, "git");
 123                 pack_objects.use_shell = 1;
 124         }
 125
 126         if (shallow_nr) {
 127                 argv_array_push(&pack_objects.args, "--shallow-file");
 128                 argv_array_push(&pack_objects.args, "");
 129         }
 130         argv_array_push(&pack_objects.args, "pack-objects");
 131         argv_array_push(&pack_objects.args, "--revs");
 132         if (use_thin_pack)
 133                 argv_array_push(&pack_objects.args, "--thin");
 134
 135         argv_array_push(&pack_objects.args, "--stdout");
 136         if (shallow_nr)
 137                 argv_array_push(&pack_objects.args, "--shallow");
 138         if (!no_progress)
 139                 argv_array_push(&pack_objects.args, "--progress");
 140         if (use_ofs_delta)
 141                 argv_array_push(&pack_objects.args, "--delta-base-offset");
 142         if (use_include_tag)
 143                 argv_array_push(&pack_objects.args, "--include-tag");
 144         if (filter_options->choice) {
 145                 const char *spec =
 146                         expand_list_objects_filter_spec(filter_options);
 147                 if (pack_objects.use_shell) {
 148                         struct strbuf buf = STRBUF_INIT;
 149                         sq_quote_buf(&buf, spec);
 150                         argv_array_pushf(&pack_objects.args, "--filter=%s", buf.buf);
 151                         strbuf_release(&buf);
 152                 } else {
 153                         argv_array_pushf(&pack_objects.args, "--filter=%s",
 154                                          spec);
 155                 }
 156         }
 157
 158         pack_objects.in = -1;
 159         pack_objects.out = -1;
 160         pack_objects.err = -1;
 161
 162         if (start_command(&pack_objects))
 163                 die("git upload-pack: unable to fork git-pack-objects");
 164
 165         pipe_fd = xfdopen(pack_objects.in, "w");
 166
 167         if (shallow_nr)
 168                 for_each_commit_graft(write_one_shallow, pipe_fd);
 169
 170         for (i = 0; i < want_obj->nr; i++)
 171                 fprintf(pipe_fd, "%s\n",
 172                         oid_to_hex(&want_obj->objects[i].item->oid));
 173         fprintf(pipe_fd, "--not\n");
 174         for (i = 0; i < have_obj->nr; i++)
 175                 fprintf(pipe_fd, "%s\n",
 176                         oid_to_hex(&have_obj->objects[i].item->oid));
 177         for (i = 0; i < extra_edge_obj.nr; i++)
 178                 fprintf(pipe_fd, "%s\n",
 179                         oid_to_hex(&extra_edge_obj.objects[i].item->oid));
 180         fprintf(pipe_fd, "\n");
 181         fflush(pipe_fd);
 182         fclose(pipe_fd);
 183
 184         /* We read from pack_objects.err to capture stderr output for
 185          * progress bar, and pack_objects.out to capture the pack data.
 186          */
 187
 188         while (1) {
 189                 struct pollfd pfd[2];
 190                 int pe, pu, pollsize;
 191                 int ret;
 192
 193                 reset_timeout();
 194
 195                 pollsize = 0;
 196                 pe = pu = -1;
 197
 198                 if (0 <= pack_objects.out) {
 199                         pfd[pollsize].fd = pack_objects.out;
 200                         pfd[pollsize].events = POLLIN;
 201                         pu = pollsize;
 202                         pollsize++;
 203                 }
 204                 if (0 <= pack_objects.err) {
 205                         pfd[pollsize].fd = pack_objects.err;
 206                         pfd[pollsize].events = POLLIN;
 207                         pe = pollsize;
 208                         pollsize++;
 209                 }
 210
 211                 if (!pollsize)
 212                         break;
 213
 214                 ret = poll(pfd, pollsize,
 215                         keepalive < 0 ? -1 : 1000 * keepalive);
 216
 217                 if (ret < 0) {
 218                         if (errno != EINTR) {
 219                                 error_errno("poll failed, resuming");
 220                                 sleep(1);
 221                         }
 222                         continue;
 223                 }
 224                 if (0 <= pe && (pfd[pe].revents & (POLLIN|POLLHUP))) {
 225                         /* Status ready; we ship that in the side-band
 226                          * or dump to the standard error.
 227                          */
 228                         sz = xread(pack_objects.err, progress,
 229                                   sizeof(progress));
 230                         if (0 < sz)
 231                                 send_client_data(2, progress, sz);
 232                         else if (sz == 0) {
 233                                 close(pack_objects.err);
 234                                 pack_objects.err = -1;
 235                         }
 236                         else
 237                                 goto fail;
 238                         /* give priority to status messages */
 239                         continue;
 240                 }
 241                 if (0 <= pu && (pfd[pu].revents & (POLLIN|POLLHUP))) {
 242                         /* Data ready; we keep the last byte to ourselves
 243                          * in case we detect broken rev-list, so that we
 244                          * can leave the stream corrupted.  This is
 245                          * unfortunate -- unpack-objects would happily
 246                          * accept a valid packdata with trailing garbage,
 247                          * so appending garbage after we pass all the
 248                          * pack data is not good enough to signal
 249                          * breakage to downstream.
 250                          */
 251                         char *cp = data;
 252                         ssize_t outsz = 0;
 253                         if (0 <= buffered) {
 254                                 *cp++ = buffered;
 255                                 outsz++;
 256                         }
 257                         sz = xread(pack_objects.out, cp,
 258                                   sizeof(data) - outsz);
 259                         if (0 < sz)
 260                                 ;
 261                         else if (sz == 0) {
 262                                 close(pack_objects.out);
 263                                 pack_objects.out = -1;
 264                         }
 265                         else
 266                                 goto fail;
 267                         sz += outsz;
 268                         if (1 < sz) {
 269                                 buffered = data[sz-1] & 0xFF;
 270                                 sz--;
 271                         }
 272                         else
 273                                 buffered = -1;
 274                         send_client_data(1, data, sz);
 275                 }
 276
 277                 /*
 278                  * We hit the keepalive timeout without saying anything; send
 279                  * an empty message on the data sideband just to let the other
 280                  * side know we're still working on it, but don't have any data
 281                  * yet.
 282                  *
 283                  * If we don't have a sideband channel, there's no room in the
 284                  * protocol to say anything, so those clients are just out of
 285                  * luck.
 286                  */
 287                 if (!ret && use_sideband) {
 288                         static const char buf[] = "0005\1";
 289                         write_or_die(1, buf, 5);
 290                 }
 291         }
 292
 293         if (finish_command(&pack_objects)) {
 294                 error("git upload-pack: git-pack-objects died with error.");
 295                 goto fail;
 296         }
 297
 298         /* flush the data */
 299         if (0 <= buffered) {
 300                 data[0] = buffered;
 301                 send_client_data(1, data, 1);
 302                 fprintf(stderr, "flushed.\n");
 303         }
 304         if (use_sideband)
 305                 packet_flush(1);
 306         return;
 307
 308  fail:
 309         send_client_data(3, abort_msg, sizeof(abort_msg));
 310         die("git upload-pack: %s", abort_msg);
 311 }
 312
 313 static int got_oid(const char *hex, struct object_id *oid,
 314                    struct object_array *have_obj)
 315 {
 316         struct object *o;
 317         int we_knew_they_have = 0;
 318
 319         if (get_oid_hex(hex, oid))
 320                 die("git upload-pack: expected SHA1 object, got '%s'", hex);
 321         if (!has_object_file(oid))
 322                 return -1;
 323
 324         o = parse_object(the_repository, oid);
 325         if (!o)
 326                 die("oops (%s)", oid_to_hex(oid));
 327         if (o->type == OBJ_COMMIT) {
 328                 struct commit_list *parents;
 329                 struct commit *commit = (struct commit *)o;
 330                 if (o->flags & THEY_HAVE)
 331                         we_knew_they_have = 1;
 332                 else
 333                         o->flags |= THEY_HAVE;
 334                 if (!oldest_have || (commit->date < oldest_have))
 335                         oldest_have = commit->date;
 336                 for (parents = commit->parents;
 337                      parents;
 338                      parents = parents->next)
 339                         parents->item->object.flags |= THEY_HAVE;
 340         }
 341         if (!we_knew_they_have) {
 342                 add_object_array(o, NULL, have_obj);
 343                 return 1;
 344         }
 345         return 0;
 346 }
 347
 348 static int ok_to_give_up(const struct object_array *have_obj,
 349                          struct object_array *want_obj)
 350 {
 351         uint32_t min_generation = GENERATION_NUMBER_ZERO;
 352
 353         if (!have_obj->nr)
 354                 return 0;
 355
 356         return can_all_from_reach_with_flag(want_obj, THEY_HAVE,
 357                                             COMMON_KNOWN, oldest_have,
 358                                             min_generation);
 359 }
 360
 361 static int get_common_commits(struct packet_reader *reader,
 362                               struct object_array *have_obj,
 363                               struct object_array *want_obj)
 364 {
 365         struct object_id oid;
 366         char last_hex[GIT_MAX_HEXSZ + 1];
 367         int got_common = 0;
 368         int got_other = 0;
 369         int sent_ready = 0;
 370
 371         save_commit_buffer = 0;
 372
 373         for (;;) {
 374                 const char *arg;
 375
 376                 reset_timeout();
 377
 378                 if (packet_reader_read(reader) != PACKET_READ_NORMAL) {
 379                         if (multi_ack == 2 && got_common
 380                             && !got_other && ok_to_give_up(have_obj, want_obj)) {
 381                                 sent_ready = 1;
 382                                 packet_write_fmt(1, "ACK %s ready\n", last_hex);
 383                         }
 384                         if (have_obj->nr == 0 || multi_ack)
 385                                 packet_write_fmt(1, "NAK\n");
 386
 387                         if (no_done && sent_ready) {
 388                                 packet_write_fmt(1, "ACK %s\n", last_hex);
 389                                 return 0;
 390                         }
 391                         if (stateless_rpc)
 392                                 exit(0);
 393                         got_common = 0;
 394                         got_other = 0;
 395                         continue;
 396                 }
 397                 if (skip_prefix(reader->line, "have ", &arg)) {
 398                         switch (got_oid(arg, &oid, have_obj)) {
 399                         case -1: /* they have what we do not */
 400                                 got_other = 1;
 401                                 if (multi_ack && ok_to_give_up(have_obj, want_obj)) {
 402                                         const char *hex = oid_to_hex(&oid);
 403                                         if (multi_ack == 2) {
 404                                                 sent_ready = 1;
 405                                                 packet_write_fmt(1, "ACK %s ready\n", hex);
 406                                         } else
 407                                                 packet_write_fmt(1, "ACK %s continue\n", hex);
 408                                 }
 409                                 break;
 410                         default:
 411                                 got_common = 1;
 412                                 oid_to_hex_r(last_hex, &oid);
 413                                 if (multi_ack == 2)
 414                                         packet_write_fmt(1, "ACK %s common\n", last_hex);
 415                                 else if (multi_ack)
 416                                         packet_write_fmt(1, "ACK %s continue\n", last_hex);
 417                                 else if (have_obj->nr == 1)
 418                                         packet_write_fmt(1, "ACK %s\n", last_hex);
 419                                 break;
 420                         }
 421                         continue;
 422                 }
 423                 if (!strcmp(reader->line, "done")) {
 424                         if (have_obj->nr > 0) {
 425                                 if (multi_ack)
 426                                         packet_write_fmt(1, "ACK %s\n", last_hex);
 427                                 return 0;
 428                         }
 429                         packet_write_fmt(1, "NAK\n");
 430                         return -1;
 431                 }
 432                 die("git upload-pack: expected SHA1 list, got '%s'", reader->line);
 433         }
 434 }
 435
 436 static int is_our_ref(struct object *o)
 437 {
 438         int allow_hidden_ref = (allow_unadvertised_object_request &
 439                         (ALLOW_TIP_SHA1 | ALLOW_REACHABLE_SHA1));
 440         return o->flags & ((allow_hidden_ref ? HIDDEN_REF : 0) | OUR_REF);
 441 }
 442
 443 /*
 444  * on successful case, it's up to the caller to close cmd->out
 445  */
 446 static int do_reachable_revlist(struct child_process *cmd,
 447                                 struct object_array *src,
 448                                 struct object_array *reachable)
 449 {
 450         static const char *argv[] = {
 451                 "rev-list", "--stdin", NULL,
 452         };
 453         struct object *o;
 454         char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */
 455         int i;
 456         const unsigned hexsz = the_hash_algo->hexsz;
 457
 458         cmd->argv = argv;
 459         cmd->git_cmd = 1;
 460         cmd->no_stderr = 1;
 461         cmd->in = -1;
 462         cmd->out = -1;
 463
 464         /*
 465          * If the next rev-list --stdin encounters an unknown commit,
 466          * it terminates, which will cause SIGPIPE in the write loop
 467          * below.
 468          */
 469         sigchain_push(SIGPIPE, SIG_IGN);
 470
 471         if (start_command(cmd))
 472                 goto error;
 473
 474         namebuf[0] = '^';
 475         namebuf[hexsz + 1] = '\n';
 476         for (i = get_max_object_index(); 0 < i; ) {
 477                 o = get_indexed_object(--i);
 478                 if (!o)
 479                         continue;
 480                 if (reachable && o->type == OBJ_COMMIT)
 481                         o->flags &= ~TMP_MARK;
 482                 if (!is_our_ref(o))
 483                         continue;
 484                 memcpy(namebuf + 1, oid_to_hex(&o->oid), hexsz);
 485                 if (write_in_full(cmd->in, namebuf, hexsz + 2) < 0)
 486                         goto error;
 487         }
 488         namebuf[hexsz] = '\n';
 489         for (i = 0; i < src->nr; i++) {
 490                 o = src->objects[i].item;
 491                 if (is_our_ref(o)) {
 492                         if (reachable)
 493                                 add_object_array(o, NULL, reachable);
 494                         continue;
 495                 }
 496                 if (reachable && o->type == OBJ_COMMIT)
 497                         o->flags |= TMP_MARK;
 498                 memcpy(namebuf, oid_to_hex(&o->oid), hexsz);
 499                 if (write_in_full(cmd->in, namebuf, hexsz + 1) < 0)
 500                         goto error;
 501         }
 502         close(cmd->in);
 503         cmd->in = -1;
 504         sigchain_pop(SIGPIPE);
 505
 506         return 0;
 507
 508 error:
 509         sigchain_pop(SIGPIPE);
 510
 511         if (cmd->in >= 0)
 512                 close(cmd->in);
 513         if (cmd->out >= 0)
 514                 close(cmd->out);
 515         return -1;
 516 }
 517
 518 static int get_reachable_list(struct object_array *src,
 519                               struct object_array *reachable)
 520 {
 521         struct child_process cmd = CHILD_PROCESS_INIT;
 522         int i;
 523         struct object *o;
 524         char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */
 525         const unsigned hexsz = the_hash_algo->hexsz;
 526
 527         if (do_reachable_revlist(&cmd, src, reachable) < 0)
 528                 return -1;
 529
 530         while ((i = read_in_full(cmd.out, namebuf, hexsz + 1)) == hexsz + 1) {
 531                 struct object_id oid;
 532                 const char *p;
 533
 534                 if (parse_oid_hex(namebuf, &oid, &p) || *p != '\n')
 535                         break;
 536
 537                 o = lookup_object(the_repository, &oid);
 538                 if (o && o->type == OBJ_COMMIT) {
 539                         o->flags &= ~TMP_MARK;
 540                 }
 541         }
 542         for (i = get_max_object_index(); 0 < i; i--) {
 543                 o = get_indexed_object(i - 1);
 544                 if (o && o->type == OBJ_COMMIT &&
 545                     (o->flags & TMP_MARK)) {
 546                         add_object_array(o, NULL, reachable);
 547                                 o->flags &= ~TMP_MARK;
 548                 }
 549         }
 550         close(cmd.out);
 551
 552         if (finish_command(&cmd))
 553                 return -1;
 554
 555         return 0;
 556 }
 557
 558 static int has_unreachable(struct object_array *src)
 559 {
 560         struct child_process cmd = CHILD_PROCESS_INIT;
 561         char buf[1];
 562         int i;
 563
 564         if (do_reachable_revlist(&cmd, src, NULL) < 0)
 565                 return 1;
 566
 567         /*
 568          * The commits out of the rev-list are not ancestors of
 569          * our ref.
 570          */
 571         i = read_in_full(cmd.out, buf, 1);
 572         if (i)
 573                 goto error;
 574         close(cmd.out);
 575         cmd.out = -1;
 576
 577         /*
 578          * rev-list may have died by encountering a bad commit
 579          * in the history, in which case we do want to bail out
 580          * even when it showed no commit.
 581          */
 582         if (finish_command(&cmd))
 583                 goto error;
 584
 585         /* All the non-tip ones are ancestors of what we advertised */
 586         return 0;
 587
 588 error:
 589         sigchain_pop(SIGPIPE);
 590         if (cmd.out >= 0)
 591                 close(cmd.out);
 592         return 1;
 593 }
 594
 595 static void check_non_tip(struct object_array *want_obj,
 596                           struct packet_writer *writer)
 597 {
 598         int i;
 599
 600         /*
 601          * In the normal in-process case without
 602          * uploadpack.allowReachableSHA1InWant,
 603          * non-tip requests can never happen.
 604          */
 605         if (!stateless_rpc && !(allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1))
 606                 goto error;
 607         if (!has_unreachable(want_obj))
 608                 /* All the non-tip ones are ancestors of what we advertised */
 609                 return;
 610
 611 error:
 612         /* Pick one of them (we know there at least is one) */
 613         for (i = 0; i < want_obj->nr; i++) {
 614                 struct object *o = want_obj->objects[i].item;
 615                 if (!is_our_ref(o)) {
 616                         packet_writer_error(writer,
 617                                             "upload-pack: not our ref %s",
 618                                             oid_to_hex(&o->oid));
 619                         die("git upload-pack: not our ref %s",
 620                             oid_to_hex(&o->oid));
 621                 }
 622         }
 623 }
 624
 625 static void send_shallow(struct packet_writer *writer,
 626                          struct commit_list *result)
 627 {
 628         while (result) {
 629                 struct object *object = &result->item->object;
 630                 if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) {
 631                         packet_writer_write(writer, "shallow %s",
 632                                             oid_to_hex(&object->oid));
 633                         register_shallow(the_repository, &object->oid);
 634                         shallow_nr++;
 635                 }
 636                 result = result->next;
 637         }
 638 }
 639
 640 static void send_unshallow(struct packet_writer *writer,
 641                            const struct object_array *shallows,
 642                            struct object_array *want_obj)
 643 {
 644         int i;
 645
 646         for (i = 0; i < shallows->nr; i++) {
 647                 struct object *object = shallows->objects[i].item;
 648                 if (object->flags & NOT_SHALLOW) {
 649                         struct commit_list *parents;
 650                         packet_writer_write(writer, "unshallow %s",
 651                                             oid_to_hex(&object->oid));
 652                         object->flags &= ~CLIENT_SHALLOW;
 653                         /*
 654                          * We want to _register_ "object" as shallow, but we
 655                          * also need to traverse object's parents to deepen a
 656                          * shallow clone. Unregister it for now so we can
 657                          * parse and add the parents to the want list, then
 658                          * re-register it.
 659                          */
 660                         unregister_shallow(&object->oid);
 661                         object->parsed = 0;
 662                         parse_commit_or_die((struct commit *)object);
 663                         parents = ((struct commit *)object)->parents;
 664                         while (parents) {
 665                                 add_object_array(&parents->item->object,
 666                                                  NULL, want_obj);
 667                                 parents = parents->next;
 668                         }
 669                         add_object_array(object, NULL, &extra_edge_obj);
 670                 }
 671                 /* make sure commit traversal conforms to client */
 672                 register_shallow(the_repository, &object->oid);
 673         }
 674 }
 675
 676 static int check_ref(const char *refname_full, const struct object_id *oid,
 677                      int flag, void *cb_data);
 678 static void deepen(struct packet_writer *writer, int depth, int deepen_relative,
 679                    struct object_array *shallows, struct object_array *want_obj)
 680 {
 681         if (depth == INFINITE_DEPTH && !is_repository_shallow(the_repository)) {
 682                 int i;
 683
 684                 for (i = 0; i < shallows->nr; i++) {
 685                         struct object *object = shallows->objects[i].item;
 686                         object->flags |= NOT_SHALLOW;
 687                 }
 688         } else if (deepen_relative) {
 689                 struct object_array reachable_shallows = OBJECT_ARRAY_INIT;
 690                 struct commit_list *result;
 691
 692                 /*
 693                  * Checking for reachable shallows requires that our refs be
 694                  * marked with OUR_REF.
 695                  */
 696                 head_ref_namespaced(check_ref, NULL);
 697                 for_each_namespaced_ref(check_ref, NULL);
 698
 699                 get_reachable_list(shallows, &reachable_shallows);
 700                 result = get_shallow_commits(&reachable_shallows,
 701                                              depth + 1,
 702                                              SHALLOW, NOT_SHALLOW);
 703                 send_shallow(writer, result);
 704                 free_commit_list(result);
 705                 object_array_clear(&reachable_shallows);
 706         } else {
 707                 struct commit_list *result;
 708
 709                 result = get_shallow_commits(want_obj, depth,
 710                                              SHALLOW, NOT_SHALLOW);
 711                 send_shallow(writer, result);
 712                 free_commit_list(result);
 713         }
 714
 715         send_unshallow(writer, shallows, want_obj);
 716 }
 717
 718 static void deepen_by_rev_list(struct packet_writer *writer, int ac,
 719                                const char **av,
 720                                struct object_array *shallows,
 721                                struct object_array *want_obj)
 722 {
 723         struct commit_list *result;
 724
 725         disable_commit_graph(the_repository);
 726         result = get_shallow_commits_by_rev_list(ac, av, SHALLOW, NOT_SHALLOW);
 727         send_shallow(writer, result);
 728         free_commit_list(result);
 729         send_unshallow(writer, shallows, want_obj);
 730 }
 731
 732 /* Returns 1 if a shallow list is sent or 0 otherwise */
 733 static int send_shallow_list(struct packet_writer *writer,
 734                              int depth, int deepen_rev_list,
 735                              timestamp_t deepen_since,
 736                              struct string_list *deepen_not,
 737                              int deepen_relative,
 738                              struct object_array *shallows,
 739                              struct object_array *want_obj)
 740 {
 741         int ret = 0;
 742
 743         if (depth > 0 && deepen_rev_list)
 744                 die("git upload-pack: deepen and deepen-since (or deepen-not) cannot be used together");
 745         if (depth > 0) {
 746                 deepen(writer, depth, deepen_relative, shallows, want_obj);
 747                 ret = 1;
 748         } else if (deepen_rev_list) {
 749                 struct argv_array av = ARGV_ARRAY_INIT;
 750                 int i;
 751
 752                 argv_array_push(&av, "rev-list");
 753                 if (deepen_since)
 754                         argv_array_pushf(&av, "--max-age=%"PRItime, deepen_since);
 755                 if (deepen_not->nr) {
 756                         argv_array_push(&av, "--not");
 757                         for (i = 0; i < deepen_not->nr; i++) {
 758                                 struct string_list_item *s = deepen_not->items + i;
 759                                 argv_array_push(&av, s->string);
 760                         }
 761                         argv_array_push(&av, "--not");
 762                 }
 763                 for (i = 0; i < want_obj->nr; i++) {
 764                         struct object *o = want_obj->objects[i].item;
 765                         argv_array_push(&av, oid_to_hex(&o->oid));
 766                 }
 767                 deepen_by_rev_list(writer, av.argc, av.argv, shallows, want_obj);
 768                 argv_array_clear(&av);
 769                 ret = 1;
 770         } else {
 771                 if (shallows->nr > 0) {
 772                         int i;
 773                         for (i = 0; i < shallows->nr; i++)
 774                                 register_shallow(the_repository,
 775                                                  &shallows->objects[i].item->oid);
 776                 }
 777         }
 778
 779         shallow_nr += shallows->nr;
 780         return ret;
 781 }
 782
 783 static int process_shallow(const char *line, struct object_array *shallows)
 784 {
 785         const char *arg;
 786         if (skip_prefix(line, "shallow ", &arg)) {
 787                 struct object_id oid;
 788                 struct object *object;
 789                 if (get_oid_hex(arg, &oid))
 790                         die("invalid shallow line: %s", line);
 791                 object = parse_object(the_repository, &oid);
 792                 if (!object)
 793                         return 1;
 794                 if (object->type != OBJ_COMMIT)
 795                         die("invalid shallow object %s", oid_to_hex(&oid));
 796                 if (!(object->flags & CLIENT_SHALLOW)) {
 797                         object->flags |= CLIENT_SHALLOW;
 798                         add_object_array(object, NULL, shallows);
 799                 }
 800                 return 1;
 801         }
 802
 803         return 0;
 804 }
 805
 806 static int process_deepen(const char *line, int *depth)
 807 {
 808         const char *arg;
 809         if (skip_prefix(line, "deepen ", &arg)) {
 810                 char *end = NULL;
 811                 *depth = (int)strtol(arg, &end, 0);
 812                 if (!end || *end || *depth <= 0)
 813                         die("Invalid deepen: %s", line);
 814                 return 1;
 815         }
 816
 817         return 0;
 818 }
 819
 820 static int process_deepen_since(const char *line, timestamp_t *deepen_since, int *deepen_rev_list)
 821 {
 822         const char *arg;
 823         if (skip_prefix(line, "deepen-since ", &arg)) {
 824                 char *end = NULL;
 825                 *deepen_since = parse_timestamp(arg, &end, 0);
 826                 if (!end || *end || !deepen_since ||
 827                     /* revisions.c's max_age -1 is special */
 828                     *deepen_since == -1)
 829                         die("Invalid deepen-since: %s", line);
 830                 *deepen_rev_list = 1;
 831                 return 1;
 832         }
 833         return 0;
 834 }
 835
 836 static int process_deepen_not(const char *line, struct string_list *deepen_not, int *deepen_rev_list)
 837 {
 838         const char *arg;
 839         if (skip_prefix(line, "deepen-not ", &arg)) {
 840                 char *ref = NULL;
 841                 struct object_id oid;
 842                 if (expand_ref(the_repository, arg, strlen(arg), &oid, &ref) != 1)
 843                         die("git upload-pack: ambiguous deepen-not: %s", line);
 844                 string_list_append(deepen_not, ref);
 845                 free(ref);
 846                 *deepen_rev_list = 1;
 847                 return 1;
 848         }
 849         return 0;
 850 }
 851
 852 static void receive_needs(struct packet_reader *reader,
 853                           struct object_array *want_obj,
 854                           struct list_objects_filter_options *filter_options)
 855 {
 856         struct object_array shallows = OBJECT_ARRAY_INIT;
 857         struct string_list deepen_not = STRING_LIST_INIT_DUP;
 858         int depth = 0;
 859         int has_non_tip = 0;
 860         timestamp_t deepen_since = 0;
 861         int deepen_rev_list = 0;
 862         int deepen_relative = 0;
 863         struct packet_writer writer;
 864
 865         shallow_nr = 0;
 866         packet_writer_init(&writer, 1);
 867         for (;;) {
 868                 struct object *o;
 869                 const char *features;
 870                 struct object_id oid_buf;
 871                 const char *arg;
 872
 873                 reset_timeout();
 874                 if (packet_reader_read(reader) != PACKET_READ_NORMAL)
 875                         break;
 876
 877                 if (process_shallow(reader->line, &shallows))
 878                         continue;
 879                 if (process_deepen(reader->line, &depth))
 880                         continue;
 881                 if (process_deepen_since(reader->line, &deepen_since, &deepen_rev_list))
 882                         continue;
 883                 if (process_deepen_not(reader->line, &deepen_not, &deepen_rev_list))
 884                         continue;
 885
 886                 if (skip_prefix(reader->line, "filter ", &arg)) {
 887                         if (!filter_capability_requested)
 888                                 die("git upload-pack: filtering capability not negotiated");
 889                         list_objects_filter_die_if_populated(filter_options);
 890                         parse_list_objects_filter(filter_options, arg);
 891                         continue;
 892                 }
 893
 894                 if (!skip_prefix(reader->line, "want ", &arg) ||
 895                     parse_oid_hex(arg, &oid_buf, &features))
 896                         die("git upload-pack: protocol error, "
 897                             "expected to get object ID, not '%s'", reader->line);
 898
 899                 if (parse_feature_request(features, "deepen-relative"))
 900                         deepen_relative = 1;
 901                 if (parse_feature_request(features, "multi_ack_detailed"))
 902                         multi_ack = 2;
 903                 else if (parse_feature_request(features, "multi_ack"))
 904                         multi_ack = 1;
 905                 if (parse_feature_request(features, "no-done"))
 906                         no_done = 1;
 907                 if (parse_feature_request(features, "thin-pack"))
 908                         use_thin_pack = 1;
 909                 if (parse_feature_request(features, "ofs-delta"))
 910                         use_ofs_delta = 1;
 911                 if (parse_feature_request(features, "side-band-64k"))
 912                         use_sideband = LARGE_PACKET_MAX;
 913                 else if (parse_feature_request(features, "side-band"))
 914                         use_sideband = DEFAULT_PACKET_MAX;
 915                 if (parse_feature_request(features, "no-progress"))
 916                         no_progress = 1;
 917                 if (parse_feature_request(features, "include-tag"))
 918                         use_include_tag = 1;
 919                 if (allow_filter && parse_feature_request(features, "filter"))
 920                         filter_capability_requested = 1;
 921
 922                 o = parse_object(the_repository, &oid_buf);
 923                 if (!o) {
 924                         packet_writer_error(&writer,
 925                                             "upload-pack: not our ref %s",
 926                                             oid_to_hex(&oid_buf));
 927                         die("git upload-pack: not our ref %s",
 928                             oid_to_hex(&oid_buf));
 929                 }
 930                 if (!(o->flags & WANTED)) {
 931                         o->flags |= WANTED;
 932                         if (!((allow_unadvertised_object_request & ALLOW_ANY_SHA1) == ALLOW_ANY_SHA1
 933                               || is_our_ref(o)))
 934                                 has_non_tip = 1;
 935                         add_object_array(o, NULL, want_obj);
 936                 }
 937         }
 938
 939         /*
 940          * We have sent all our refs already, and the other end
 941          * should have chosen out of them. When we are operating
 942          * in the stateless RPC mode, however, their choice may
 943          * have been based on the set of older refs advertised
 944          * by another process that handled the initial request.
 945          */
 946         if (has_non_tip)
 947                 check_non_tip(want_obj, &writer);
 948
 949         if (!use_sideband && daemon_mode)
 950                 no_progress = 1;
 951
 952         if (depth == 0 && !deepen_rev_list && shallows.nr == 0)
 953                 return;
 954
 955         if (send_shallow_list(&writer, depth, deepen_rev_list, deepen_since,
 956                               &deepen_not, deepen_relative, &shallows,
 957                               want_obj))
 958                 packet_flush(1);
 959         object_array_clear(&shallows);
 960 }
 961
 962 /* return non-zero if the ref is hidden, otherwise 0 */
 963 static int mark_our_ref(const char *refname, const char *refname_full,
 964                         const struct object_id *oid)
 965 {
 966         struct object *o = lookup_unknown_object(oid);
 967
 968         if (ref_is_hidden(refname, refname_full)) {
 969                 o->flags |= HIDDEN_REF;
 970                 return 1;
 971         }
 972         o->flags |= OUR_REF;
 973         return 0;
 974 }
 975
 976 static int check_ref(const char *refname_full, const struct object_id *oid,
 977                      int flag, void *cb_data)
 978 {
 979         const char *refname = strip_namespace(refname_full);
 980
 981         mark_our_ref(refname, refname_full, oid);
 982         return 0;
 983 }
 984
 985 static void format_symref_info(struct strbuf *buf, struct string_list *symref)
 986 {
 987         struct string_list_item *item;
 988
 989         if (!symref->nr)
 990                 return;
 991         for_each_string_list_item(item, symref)
 992                 strbuf_addf(buf, " symref=%s:%s", item->string, (char *)item->util);
 993 }
 994
 995 static int send_ref(const char *refname, const struct object_id *oid,
 996                     int flag, void *cb_data)
 997 {
 998         static const char *capabilities = "multi_ack thin-pack side-band"
 999                 " side-band-64k ofs-delta shallow deepen-since deepen-not"
1000                 " deepen-relative no-progress include-tag multi_ack_detailed";
1001         const char *refname_nons = strip_namespace(refname);
1002         struct object_id peeled;
1003
1004         if (mark_our_ref(refname_nons, refname, oid))
1005                 return 0;
1006
1007         if (capabilities) {
1008                 struct strbuf symref_info = STRBUF_INIT;
1009
1010                 format_symref_info(&symref_info, cb_data);
1011                 packet_write_fmt(1, "%s %s%c%s%s%s%s%s%s agent=%s\n",
1012                              oid_to_hex(oid), refname_nons,
1013                              0, capabilities,
1014                              (allow_unadvertised_object_request & ALLOW_TIP_SHA1) ?
1015                                      " allow-tip-sha1-in-want" : "",
1016                              (allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1) ?
1017                                      " allow-reachable-sha1-in-want" : "",
1018                              stateless_rpc ? " no-done" : "",
1019                              symref_info.buf,
1020                              allow_filter ? " filter" : "",
1021                              git_user_agent_sanitized());
1022                 strbuf_release(&symref_info);
1023         } else {
1024                 packet_write_fmt(1, "%s %s\n", oid_to_hex(oid), refname_nons);
1025         }
1026         capabilities = NULL;
1027         if (!peel_ref(refname, &peeled))
1028                 packet_write_fmt(1, "%s %s^{}\n", oid_to_hex(&peeled), refname_nons);
1029         return 0;
1030 }
1031
1032 static int find_symref(const char *refname, const struct object_id *oid,
1033                        int flag, void *cb_data)
1034 {
1035         const char *symref_target;
1036         struct string_list_item *item;
1037
1038         if ((flag & REF_ISSYMREF) == 0)
1039                 return 0;
1040         symref_target = resolve_ref_unsafe(refname, 0, NULL, &flag);
1041         if (!symref_target || (flag & REF_ISSYMREF) == 0)
1042                 die("'%s' is a symref but it is not?", refname);
1043         item = string_list_append(cb_data, strip_namespace(refname));
1044         item->util = xstrdup(strip_namespace(symref_target));
1045         return 0;
1046 }
1047
1048 static int upload_pack_config(const char *var, const char *value, void *unused)
1049 {
1050         if (!strcmp("uploadpack.allowtipsha1inwant", var)) {
1051                 if (git_config_bool(var, value))
1052                         allow_unadvertised_object_request |= ALLOW_TIP_SHA1;
1053                 else
1054                         allow_unadvertised_object_request &= ~ALLOW_TIP_SHA1;
1055         } else if (!strcmp("uploadpack.allowreachablesha1inwant", var)) {
1056                 if (git_config_bool(var, value))
1057                         allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1;
1058                 else
1059                         allow_unadvertised_object_request &= ~ALLOW_REACHABLE_SHA1;
1060         } else if (!strcmp("uploadpack.allowanysha1inwant", var)) {
1061                 if (git_config_bool(var, value))
1062                         allow_unadvertised_object_request |= ALLOW_ANY_SHA1;
1063                 else
1064                         allow_unadvertised_object_request &= ~ALLOW_ANY_SHA1;
1065         } else if (!strcmp("uploadpack.keepalive", var)) {
1066                 keepalive = git_config_int(var, value);
1067                 if (!keepalive)
1068                         keepalive = -1;
1069         } else if (!strcmp("uploadpack.allowfilter", var)) {
1070                 allow_filter = git_config_bool(var, value);
1071         } else if (!strcmp("uploadpack.allowrefinwant", var)) {
1072                 allow_ref_in_want = git_config_bool(var, value);
1073         } else if (!strcmp("uploadpack.allowsidebandall", var)) {
1074                 allow_sideband_all = git_config_bool(var, value);
1075         } else if (!strcmp("core.precomposeunicode", var)) {
1076                 precomposed_unicode = git_config_bool(var, value);
1077         }
1078
1079         if (current_config_scope() != CONFIG_SCOPE_LOCAL &&
1080         current_config_scope() != CONFIG_SCOPE_WORKTREE) {
1081                 if (!strcmp("uploadpack.packobjectshook", var))
1082                         return git_config_string(&pack_objects_hook, var, value);
1083         }
1084
1085         return parse_hide_refs_config(var, value, "uploadpack");
1086 }
1087
1088 void upload_pack(struct upload_pack_options *options)
1089 {
1090         struct string_list symref = STRING_LIST_INIT_DUP;
1091         struct object_array want_obj = OBJECT_ARRAY_INIT;
1092         struct packet_reader reader;
1093         struct list_objects_filter_options filter_options;
1094
1095         stateless_rpc = options->stateless_rpc;
1096         timeout = options->timeout;
1097         daemon_mode = options->daemon_mode;
1098
1099         memset(&filter_options, 0, sizeof(filter_options));
1100
1101         git_config(upload_pack_config, NULL);
1102
1103         head_ref_namespaced(find_symref, &symref);
1104
1105         if (options->advertise_refs || !stateless_rpc) {
1106                 reset_timeout();
1107                 head_ref_namespaced(send_ref, &symref);
1108                 for_each_namespaced_ref(send_ref, &symref);
1109                 advertise_shallow_grafts(1);
1110                 packet_flush(1);
1111         } else {
1112                 head_ref_namespaced(check_ref, NULL);
1113                 for_each_namespaced_ref(check_ref, NULL);
1114         }
1115         string_list_clear(&symref, 1);
1116         if (options->advertise_refs)
1117                 return;
1118
1119         packet_reader_init(&reader, 0, NULL, 0,
1120                            PACKET_READ_CHOMP_NEWLINE |
1121                            PACKET_READ_DIE_ON_ERR_PACKET);
1122
1123         receive_needs(&reader, &want_obj, &filter_options);
1124         if (want_obj.nr) {
1125                 struct object_array have_obj = OBJECT_ARRAY_INIT;
1126                 get_common_commits(&reader, &have_obj, &want_obj);
1127                 create_pack_file(&have_obj, &want_obj, &filter_options);
1128         }
1129
1130         list_objects_filter_release(&filter_options);
1131 }
1132
1133 struct upload_pack_data {
1134         struct object_array wants;
1135         struct string_list wanted_refs;
1136         struct oid_array haves;
1137
1138         struct object_array shallows;
1139         struct string_list deepen_not;
1140         int depth;
1141         timestamp_t deepen_since;
1142         int deepen_rev_list;
1143         int deepen_relative;
1144
1145         struct list_objects_filter_options filter_options;
1146
1147         struct packet_writer writer;
1148
1149         unsigned stateless_rpc : 1;
1150
1151         unsigned use_thin_pack : 1;
1152         unsigned use_ofs_delta : 1;
1153         unsigned no_progress : 1;
1154         unsigned use_include_tag : 1;
1155         unsigned done : 1;
1156 };
1157
1158 static void upload_pack_data_init(struct upload_pack_data *data)
1159 {
1160         struct object_array wants = OBJECT_ARRAY_INIT;
1161         struct string_list wanted_refs = STRING_LIST_INIT_DUP;
1162         struct oid_array haves = OID_ARRAY_INIT;
1163         struct object_array shallows = OBJECT_ARRAY_INIT;
1164         struct string_list deepen_not = STRING_LIST_INIT_DUP;
1165
1166         memset(data, 0, sizeof(*data));
1167         data->wants = wants;
1168         data->wanted_refs = wanted_refs;
1169         data->haves = haves;
1170         data->shallows = shallows;
1171         data->deepen_not = deepen_not;
1172         packet_writer_init(&data->writer, 1);
1173 }
1174
1175 static void upload_pack_data_clear(struct upload_pack_data *data)
1176 {
1177         object_array_clear(&data->wants);
1178         string_list_clear(&data->wanted_refs, 1);
1179         oid_array_clear(&data->haves);
1180         object_array_clear(&data->shallows);
1181         string_list_clear(&data->deepen_not, 0);
1182         list_objects_filter_release(&data->filter_options);
1183 }
1184
1185 static int parse_want(struct packet_writer *writer, const char *line,
1186                       struct object_array *want_obj)
1187 {
1188         const char *arg;
1189         if (skip_prefix(line, "want ", &arg)) {
1190                 struct object_id oid;
1191                 struct object *o;
1192
1193                 if (get_oid_hex(arg, &oid))
1194                         die("git upload-pack: protocol error, "
1195                             "expected to get oid, not '%s'", line);
1196
1197                 o = parse_object(the_repository, &oid);
1198                 if (!o) {
1199                         packet_writer_error(writer,
1200                                             "upload-pack: not our ref %s",
1201                                             oid_to_hex(&oid));
1202                         die("git upload-pack: not our ref %s",
1203                             oid_to_hex(&oid));
1204                 }
1205
1206                 if (!(o->flags & WANTED)) {
1207                         o->flags |= WANTED;
1208                         add_object_array(o, NULL, want_obj);
1209                 }
1210
1211                 return 1;
1212         }
1213
1214         return 0;
1215 }
1216
1217 static int parse_want_ref(struct packet_writer *writer, const char *line,
1218                           struct string_list *wanted_refs,
1219                           struct object_array *want_obj)
1220 {
1221         const char *arg;
1222         if (skip_prefix(line, "want-ref ", &arg)) {
1223                 struct object_id oid;
1224                 struct string_list_item *item;
1225                 struct object *o;
1226
1227                 if (read_ref(arg, &oid)) {
1228                         packet_writer_error(writer, "unknown ref %s", arg);
1229                         die("unknown ref %s", arg);
1230                 }
1231
1232                 item = string_list_append(wanted_refs, arg);
1233                 item->util = oiddup(&oid);
1234
1235                 o = parse_object_or_die(&oid, arg);
1236                 if (!(o->flags & WANTED)) {
1237                         o->flags |= WANTED;
1238                         add_object_array(o, NULL, want_obj);
1239                 }
1240
1241                 return 1;
1242         }
1243
1244         return 0;
1245 }
1246
1247 static int parse_have(const char *line, struct oid_array *haves)
1248 {
1249         const char *arg;
1250         if (skip_prefix(line, "have ", &arg)) {
1251                 struct object_id oid;
1252
1253                 if (get_oid_hex(arg, &oid))
1254                         die("git upload-pack: expected SHA1 object, got '%s'", arg);
1255                 oid_array_append(haves, &oid);
1256                 return 1;
1257         }
1258
1259         return 0;
1260 }
1261
1262 static void process_args(struct packet_reader *request,
1263                          struct upload_pack_data *data,
1264                          struct object_array *want_obj)
1265 {
1266         while (packet_reader_read(request) == PACKET_READ_NORMAL) {
1267                 const char *arg = request->line;
1268                 const char *p;
1269
1270                 /* process want */
1271                 if (parse_want(&data->writer, arg, want_obj))
1272                         continue;
1273                 if (allow_ref_in_want &&
1274                     parse_want_ref(&data->writer, arg, &data->wanted_refs,
1275                                    want_obj))
1276                         continue;
1277                 /* process have line */
1278                 if (parse_have(arg, &data->haves))
1279                         continue;
1280
1281                 /* process args like thin-pack */
1282                 if (!strcmp(arg, "thin-pack")) {
1283                         use_thin_pack = 1;
1284                         continue;
1285                 }
1286                 if (!strcmp(arg, "ofs-delta")) {
1287                         use_ofs_delta = 1;
1288                         continue;
1289                 }
1290                 if (!strcmp(arg, "no-progress")) {
1291                         no_progress = 1;
1292                         continue;
1293                 }
1294                 if (!strcmp(arg, "include-tag")) {
1295                         use_include_tag = 1;
1296                         continue;
1297                 }
1298                 if (!strcmp(arg, "done")) {
1299                         data->done = 1;
1300                         continue;
1301                 }
1302
1303                 /* Shallow related arguments */
1304                 if (process_shallow(arg, &data->shallows))
1305                         continue;
1306                 if (process_deepen(arg, &data->depth))
1307                         continue;
1308                 if (process_deepen_since(arg, &data->deepen_since,
1309                                          &data->deepen_rev_list))
1310                         continue;
1311                 if (process_deepen_not(arg, &data->deepen_not,
1312                                        &data->deepen_rev_list))
1313                         continue;
1314                 if (!strcmp(arg, "deepen-relative")) {
1315                         data->deepen_relative = 1;
1316                         continue;
1317                 }
1318
1319                 if (allow_filter && skip_prefix(arg, "filter ", &p)) {
1320                         list_objects_filter_die_if_populated(&data->filter_options);
1321                         parse_list_objects_filter(&data->filter_options, p);
1322                         continue;
1323                 }
1324
1325                 if ((git_env_bool("GIT_TEST_SIDEBAND_ALL", 0) ||
1326                      allow_sideband_all) &&
1327                     !strcmp(arg, "sideband-all")) {
1328                         data->writer.use_sideband = 1;
1329                         continue;
1330                 }
1331
1332                 /* ignore unknown lines maybe? */
1333                 die("unexpected line: '%s'", arg);
1334         }
1335
1336         if (request->status != PACKET_READ_FLUSH)
1337                 die(_("expected flush after fetch arguments"));
1338 }
1339
1340 static int process_haves(struct oid_array *haves, struct oid_array *common,
1341                          struct object_array *have_obj)
1342 {
1343         int i;
1344
1345         /* Process haves */
1346         for (i = 0; i < haves->nr; i++) {
1347                 const struct object_id *oid = &haves->oid[i];
1348                 struct object *o;
1349                 int we_knew_they_have = 0;
1350
1351                 if (!has_object_file(oid))
1352                         continue;
1353
1354                 oid_array_append(common, oid);
1355
1356                 o = parse_object(the_repository, oid);
1357                 if (!o)
1358                         die("oops (%s)", oid_to_hex(oid));
1359                 if (o->type == OBJ_COMMIT) {
1360                         struct commit_list *parents;
1361                         struct commit *commit = (struct commit *)o;
1362                         if (o->flags & THEY_HAVE)
1363                                 we_knew_they_have = 1;
1364                         else
1365                                 o->flags |= THEY_HAVE;
1366                         if (!oldest_have || (commit->date < oldest_have))
1367                                 oldest_have = commit->date;
1368                         for (parents = commit->parents;
1369                              parents;
1370                              parents = parents->next)
1371                                 parents->item->object.flags |= THEY_HAVE;
1372                 }
1373                 if (!we_knew_they_have)
1374                         add_object_array(o, NULL, have_obj);
1375         }
1376
1377         return 0;
1378 }
1379
1380 static int send_acks(struct packet_writer *writer, struct oid_array *acks,
1381                      const struct object_array *have_obj,
1382                      struct object_array *want_obj)
1383 {
1384         int i;
1385
1386         packet_writer_write(writer, "acknowledgments\n");
1387
1388         /* Send Acks */
1389         if (!acks->nr)
1390                 packet_writer_write(writer, "NAK\n");
1391
1392         for (i = 0; i < acks->nr; i++) {
1393                 packet_writer_write(writer, "ACK %s\n",
1394                                     oid_to_hex(&acks->oid[i]));
1395         }
1396
1397         if (ok_to_give_up(have_obj, want_obj)) {
1398                 /* Send Ready */
1399                 packet_writer_write(writer, "ready\n");
1400                 return 1;
1401         }
1402
1403         return 0;
1404 }
1405
1406 static int process_haves_and_send_acks(struct upload_pack_data *data,
1407                                        struct object_array *have_obj,
1408                                        struct object_array *want_obj)
1409 {
1410         struct oid_array common = OID_ARRAY_INIT;
1411         int ret = 0;
1412
1413         process_haves(&data->haves, &common, have_obj);
1414         if (data->done) {
1415                 ret = 1;
1416         } else if (send_acks(&data->writer, &common, have_obj, want_obj)) {
1417                 packet_writer_delim(&data->writer);
1418                 ret = 1;
1419         } else {
1420                 /* Add Flush */
1421                 packet_writer_flush(&data->writer);
1422                 ret = 0;
1423         }
1424
1425         oid_array_clear(&data->haves);
1426         oid_array_clear(&common);
1427         return ret;
1428 }
1429
1430 static void send_wanted_ref_info(struct upload_pack_data *data)
1431 {
1432         const struct string_list_item *item;
1433
1434         if (!data->wanted_refs.nr)
1435                 return;
1436
1437         packet_writer_write(&data->writer, "wanted-refs\n");
1438
1439         for_each_string_list_item(item, &data->wanted_refs) {
1440                 packet_writer_write(&data->writer, "%s %s\n",
1441                                     oid_to_hex(item->util),
1442                                     item->string);
1443         }
1444
1445         packet_writer_delim(&data->writer);
1446 }
1447
1448 static void send_shallow_info(struct upload_pack_data *data,
1449                               struct object_array *want_obj)
1450 {
1451         /* No shallow info needs to be sent */
1452         if (!data->depth && !data->deepen_rev_list && !data->shallows.nr &&
1453             !is_repository_shallow(the_repository))
1454                 return;
1455
1456         packet_writer_write(&data->writer, "shallow-info\n");
1457
1458         if (!send_shallow_list(&data->writer, data->depth,
1459                                data->deepen_rev_list,
1460                                data->deepen_since, &data->deepen_not,
1461                                data->deepen_relative,
1462                                &data->shallows, want_obj) &&
1463             is_repository_shallow(the_repository))
1464                 deepen(&data->writer, INFINITE_DEPTH, data->deepen_relative,
1465                        &data->shallows, want_obj);
1466
1467         packet_delim(1);
1468 }
1469
1470 enum fetch_state {
1471         FETCH_PROCESS_ARGS = 0,
1472         FETCH_SEND_ACKS,
1473         FETCH_SEND_PACK,
1474         FETCH_DONE,
1475 };
1476
1477 int upload_pack_v2(struct repository *r, struct argv_array *keys,
1478                    struct packet_reader *request)
1479 {
1480         enum fetch_state state = FETCH_PROCESS_ARGS;
1481         struct upload_pack_data data;
1482         struct object_array have_obj = OBJECT_ARRAY_INIT;
1483         struct object_array want_obj = OBJECT_ARRAY_INIT;
1484
1485         clear_object_flags(ALL_FLAGS);
1486
1487         git_config(upload_pack_config, NULL);
1488
1489         upload_pack_data_init(&data);
1490         use_sideband = LARGE_PACKET_MAX;
1491
1492         while (state != FETCH_DONE) {
1493                 switch (state) {
1494                 case FETCH_PROCESS_ARGS:
1495                         process_args(request, &data, &want_obj);
1496
1497                         if (!want_obj.nr) {
1498                                 /*
1499                                  * Request didn't contain any 'want' lines,
1500                                  * guess they didn't want anything.
1501                                  */
1502                                 state = FETCH_DONE;
1503                         } else if (data.haves.nr) {
1504                                 /*
1505                                  * Request had 'have' lines, so lets ACK them.
1506                                  */
1507                                 state = FETCH_SEND_ACKS;
1508                         } else {
1509                                 /*
1510                                  * Request had 'want's but no 'have's so we can
1511                                  * immedietly go to construct and send a pack.
1512                                  */
1513                                 state = FETCH_SEND_PACK;
1514                         }
1515                         break;
1516                 case FETCH_SEND_ACKS:
1517                         if (process_haves_and_send_acks(&data, &have_obj,
1518                                                         &want_obj))
1519                                 state = FETCH_SEND_PACK;
1520                         else
1521                                 state = FETCH_DONE;
1522                         break;
1523                 case FETCH_SEND_PACK:
1524                         send_wanted_ref_info(&data);
1525                         send_shallow_info(&data, &want_obj);
1526
1527                         packet_writer_write(&data.writer, "packfile\n");
1528                         create_pack_file(&have_obj, &want_obj, &data.filter_options);
1529                         state = FETCH_DONE;
1530                         break;
1531                 case FETCH_DONE:
1532                         continue;
1533                 }
1534         }
1535
1536         upload_pack_data_clear(&data);
1537         object_array_clear(&have_obj);
1538         object_array_clear(&want_obj);
1539         return 0;
1540 }
1541
1542 int upload_pack_advertise(struct repository *r,
1543                           struct strbuf *value)
1544 {
1545         if (value) {
1546                 int allow_filter_value;
1547                 int allow_ref_in_want;
1548                 int allow_sideband_all_value;
1549
1550                 strbuf_addstr(value, "shallow");
1551
1552                 if (!repo_config_get_bool(the_repository,
1553                                          "uploadpack.allowfilter",
1554                                          &allow_filter_value) &&
1555                     allow_filter_value)
1556                         strbuf_addstr(value, " filter");
1557
1558                 if (!repo_config_get_bool(the_repository,
1559                                          "uploadpack.allowrefinwant",
1560                                          &allow_ref_in_want) &&
1561                     allow_ref_in_want)
1562                         strbuf_addstr(value, " ref-in-want");
1563
1564                 if (git_env_bool("GIT_TEST_SIDEBAND_ALL", 0) ||
1565                     (!repo_config_get_bool(the_repository,
1566                                            "uploadpack.allowsidebandall",
1567                                            &allow_sideband_all_value) &&
1568                      allow_sideband_all_value))
1569                         strbuf_addstr(value, " sideband-all");
1570         }
1571
1572         return 1;
1573 }