upload-pack.c

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