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