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