11 #include "list-objects.h"
12 #include "run-command.h"
16 #include "string-list.h"
18 static const char upload_pack_usage[] = "git upload-pack [--strict] [--timeout=<n>] <dir>";
20 /* Remember to update object flag allocation in object.h */
21 #define THEY_HAVE (1u << 11)
22 #define OUR_REF (1u << 12)
23 #define WANTED (1u << 13)
24 #define COMMON_KNOWN (1u << 14)
25 #define REACHABLE (1u << 15)
27 #define SHALLOW (1u << 16)
28 #define NOT_SHALLOW (1u << 17)
29 #define CLIENT_SHALLOW (1u << 18)
30 #define HIDDEN_REF (1u << 19)
32 static unsigned long oldest_have;
36 static int use_thin_pack, use_ofs_delta, use_include_tag;
37 static int no_progress, daemon_mode;
38 /* Allow specifying sha1 if it is a ref tip. */
39 #define ALLOW_TIP_SHA1 01
40 /* Allow request of a sha1 if it is reachable from a ref (possibly hidden ref). */
41 #define ALLOW_REACHABLE_SHA1 02
42 static unsigned int allow_unadvertised_object_request;
43 static int shallow_nr;
44 static struct object_array have_obj;
45 static struct object_array want_obj;
46 static struct object_array extra_edge_obj;
47 static unsigned int timeout;
48 static int keepalive = 5;
50 * otherwise maximum packet size (up to 65520 bytes).
52 static int use_sideband;
53 static int advertise_refs;
54 static int stateless_rpc;
56 static void reset_timeout(void)
61 static void send_client_data(int fd, const char *data, ssize_t sz)
64 send_sideband(1, fd, data, sz, use_sideband);
71 /* XXX: are we happy to lose stuff here? */
75 write_or_die(fd, data, sz);
78 static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
81 if (graft->nr_parent == -1)
82 fprintf(fp, "--shallow %s\n", oid_to_hex(&graft->oid));
86 static void create_pack_file(void)
88 struct child_process pack_objects = CHILD_PROCESS_INIT;
89 char data[8193], progress[128];
90 char abort_msg[] = "aborting due to possible repository "
91 "corruption on the remote side.";
98 argv_array_push(&pack_objects.args, "--shallow-file");
99 argv_array_push(&pack_objects.args, "");
101 argv_array_push(&pack_objects.args, "pack-objects");
102 argv_array_push(&pack_objects.args, "--revs");
104 argv_array_push(&pack_objects.args, "--thin");
106 argv_array_push(&pack_objects.args, "--stdout");
108 argv_array_push(&pack_objects.args, "--shallow");
110 argv_array_push(&pack_objects.args, "--progress");
112 argv_array_push(&pack_objects.args, "--delta-base-offset");
114 argv_array_push(&pack_objects.args, "--include-tag");
116 pack_objects.in = -1;
117 pack_objects.out = -1;
118 pack_objects.err = -1;
119 pack_objects.git_cmd = 1;
121 if (start_command(&pack_objects))
122 die("git upload-pack: unable to fork git-pack-objects");
124 pipe_fd = xfdopen(pack_objects.in, "w");
127 for_each_commit_graft(write_one_shallow, pipe_fd);
129 for (i = 0; i < want_obj.nr; i++)
130 fprintf(pipe_fd, "%s\n",
131 oid_to_hex(&want_obj.objects[i].item->oid));
132 fprintf(pipe_fd, "--not\n");
133 for (i = 0; i < have_obj.nr; i++)
134 fprintf(pipe_fd, "%s\n",
135 oid_to_hex(&have_obj.objects[i].item->oid));
136 for (i = 0; i < extra_edge_obj.nr; i++)
137 fprintf(pipe_fd, "%s\n",
138 oid_to_hex(&extra_edge_obj.objects[i].item->oid));
139 fprintf(pipe_fd, "\n");
143 /* We read from pack_objects.err to capture stderr output for
144 * progress bar, and pack_objects.out to capture the pack data.
148 struct pollfd pfd[2];
149 int pe, pu, pollsize;
157 if (0 <= pack_objects.out) {
158 pfd[pollsize].fd = pack_objects.out;
159 pfd[pollsize].events = POLLIN;
163 if (0 <= pack_objects.err) {
164 pfd[pollsize].fd = pack_objects.err;
165 pfd[pollsize].events = POLLIN;
173 ret = poll(pfd, pollsize,
174 keepalive < 0 ? -1 : 1000 * keepalive);
177 if (errno != EINTR) {
178 error_errno("poll failed, resuming");
183 if (0 <= pe && (pfd[pe].revents & (POLLIN|POLLHUP))) {
184 /* Status ready; we ship that in the side-band
185 * or dump to the standard error.
187 sz = xread(pack_objects.err, progress,
190 send_client_data(2, progress, sz);
192 close(pack_objects.err);
193 pack_objects.err = -1;
197 /* give priority to status messages */
200 if (0 <= pu && (pfd[pu].revents & (POLLIN|POLLHUP))) {
201 /* Data ready; we keep the last byte to ourselves
202 * in case we detect broken rev-list, so that we
203 * can leave the stream corrupted. This is
204 * unfortunate -- unpack-objects would happily
205 * accept a valid packdata with trailing garbage,
206 * so appending garbage after we pass all the
207 * pack data is not good enough to signal
208 * breakage to downstream.
216 sz = xread(pack_objects.out, cp,
217 sizeof(data) - outsz);
221 close(pack_objects.out);
222 pack_objects.out = -1;
228 buffered = data[sz-1] & 0xFF;
233 send_client_data(1, data, sz);
237 * We hit the keepalive timeout without saying anything; send
238 * an empty message on the data sideband just to let the other
239 * side know we're still working on it, but don't have any data
242 * If we don't have a sideband channel, there's no room in the
243 * protocol to say anything, so those clients are just out of
246 if (!ret && use_sideband) {
247 static const char buf[] = "0005\1";
248 write_or_die(1, buf, 5);
252 if (finish_command(&pack_objects)) {
253 error("git upload-pack: git-pack-objects died with error.");
260 send_client_data(1, data, 1);
261 fprintf(stderr, "flushed.\n");
268 send_client_data(3, abort_msg, sizeof(abort_msg));
269 die("git upload-pack: %s", abort_msg);
272 static int got_sha1(char *hex, unsigned char *sha1)
275 int we_knew_they_have = 0;
277 if (get_sha1_hex(hex, sha1))
278 die("git upload-pack: expected SHA1 object, got '%s'", hex);
279 if (!has_sha1_file(sha1))
282 o = parse_object(sha1);
284 die("oops (%s)", sha1_to_hex(sha1));
285 if (o->type == OBJ_COMMIT) {
286 struct commit_list *parents;
287 struct commit *commit = (struct commit *)o;
288 if (o->flags & THEY_HAVE)
289 we_knew_they_have = 1;
291 o->flags |= THEY_HAVE;
292 if (!oldest_have || (commit->date < oldest_have))
293 oldest_have = commit->date;
294 for (parents = commit->parents;
296 parents = parents->next)
297 parents->item->object.flags |= THEY_HAVE;
299 if (!we_knew_they_have) {
300 add_object_array(o, NULL, &have_obj);
306 static int reachable(struct commit *want)
308 struct commit_list *work = NULL;
310 commit_list_insert_by_date(want, &work);
312 struct commit_list *list;
313 struct commit *commit = pop_commit(&work);
315 if (commit->object.flags & THEY_HAVE) {
316 want->object.flags |= COMMON_KNOWN;
319 if (!commit->object.parsed)
320 parse_object(commit->object.oid.hash);
321 if (commit->object.flags & REACHABLE)
323 commit->object.flags |= REACHABLE;
324 if (commit->date < oldest_have)
326 for (list = commit->parents; list; list = list->next) {
327 struct commit *parent = list->item;
328 if (!(parent->object.flags & REACHABLE))
329 commit_list_insert_by_date(parent, &work);
332 want->object.flags |= REACHABLE;
333 clear_commit_marks(want, REACHABLE);
334 free_commit_list(work);
335 return (want->object.flags & COMMON_KNOWN);
338 static int ok_to_give_up(void)
345 for (i = 0; i < want_obj.nr; i++) {
346 struct object *want = want_obj.objects[i].item;
348 if (want->flags & COMMON_KNOWN)
350 want = deref_tag(want, "a want line", 0);
351 if (!want || want->type != OBJ_COMMIT) {
352 /* no way to tell if this is reachable by
353 * looking at the ancestry chain alone, so
354 * leave a note to ourselves not to worry about
355 * this object anymore.
357 want_obj.objects[i].item->flags |= COMMON_KNOWN;
360 if (!reachable((struct commit *)want))
366 static int get_common_commits(void)
368 unsigned char sha1[20];
374 save_commit_buffer = 0;
377 char *line = packet_read_line(0, NULL);
381 if (multi_ack == 2 && got_common
382 && !got_other && ok_to_give_up()) {
384 packet_write(1, "ACK %s ready\n", last_hex);
386 if (have_obj.nr == 0 || multi_ack)
387 packet_write(1, "NAK\n");
389 if (no_done && sent_ready) {
390 packet_write(1, "ACK %s\n", last_hex);
399 if (starts_with(line, "have ")) {
400 switch (got_sha1(line+5, sha1)) {
401 case -1: /* they have what we do not */
403 if (multi_ack && ok_to_give_up()) {
404 const char *hex = sha1_to_hex(sha1);
405 if (multi_ack == 2) {
407 packet_write(1, "ACK %s ready\n", hex);
409 packet_write(1, "ACK %s continue\n", hex);
414 memcpy(last_hex, sha1_to_hex(sha1), 41);
416 packet_write(1, "ACK %s common\n", last_hex);
418 packet_write(1, "ACK %s continue\n", last_hex);
419 else if (have_obj.nr == 1)
420 packet_write(1, "ACK %s\n", last_hex);
425 if (!strcmp(line, "done")) {
426 if (have_obj.nr > 0) {
428 packet_write(1, "ACK %s\n", last_hex);
431 packet_write(1, "NAK\n");
434 die("git upload-pack: expected SHA1 list, got '%s'", line);
438 static int is_our_ref(struct object *o)
440 int allow_hidden_ref = (allow_unadvertised_object_request &
441 (ALLOW_TIP_SHA1 | ALLOW_REACHABLE_SHA1));
442 return o->flags & ((allow_hidden_ref ? HIDDEN_REF : 0) | OUR_REF);
445 static void check_non_tip(void)
447 static const char *argv[] = {
448 "rev-list", "--stdin", NULL,
450 static struct child_process cmd = CHILD_PROCESS_INIT;
452 char namebuf[42]; /* ^ + SHA-1 + LF */
456 * In the normal in-process case without
457 * uploadpack.allowReachableSHA1InWant,
458 * non-tip requests can never happen.
460 if (!stateless_rpc && !(allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1))
469 if (start_command(&cmd))
473 * If rev-list --stdin encounters an unknown commit, it
474 * terminates, which will cause SIGPIPE in the write loop
477 sigchain_push(SIGPIPE, SIG_IGN);
481 for (i = get_max_object_index(); 0 < i; ) {
482 o = get_indexed_object(--i);
487 memcpy(namebuf + 1, oid_to_hex(&o->oid), GIT_SHA1_HEXSZ);
488 if (write_in_full(cmd.in, namebuf, 42) < 0)
492 for (i = 0; i < want_obj.nr; i++) {
493 o = want_obj.objects[i].item;
496 memcpy(namebuf, oid_to_hex(&o->oid), GIT_SHA1_HEXSZ);
497 if (write_in_full(cmd.in, namebuf, 41) < 0)
502 sigchain_pop(SIGPIPE);
505 * The commits out of the rev-list are not ancestors of
508 i = read_in_full(cmd.out, namebuf, 1);
514 * rev-list may have died by encountering a bad commit
515 * in the history, in which case we do want to bail out
516 * even when it showed no commit.
518 if (finish_command(&cmd))
521 /* All the non-tip ones are ancestors of what we advertised */
525 /* Pick one of them (we know there at least is one) */
526 for (i = 0; i < want_obj.nr; i++) {
527 o = want_obj.objects[i].item;
529 die("git upload-pack: not our ref %s",
530 oid_to_hex(&o->oid));
534 static void receive_needs(void)
536 struct object_array shallows = OBJECT_ARRAY_INIT;
543 const char *features;
544 unsigned char sha1_buf[20];
545 char *line = packet_read_line(0, NULL);
550 if (starts_with(line, "shallow ")) {
551 unsigned char sha1[20];
552 struct object *object;
553 if (get_sha1_hex(line + 8, sha1))
554 die("invalid shallow line: %s", line);
555 object = parse_object(sha1);
558 if (object->type != OBJ_COMMIT)
559 die("invalid shallow object %s", sha1_to_hex(sha1));
560 if (!(object->flags & CLIENT_SHALLOW)) {
561 object->flags |= CLIENT_SHALLOW;
562 add_object_array(object, NULL, &shallows);
566 if (starts_with(line, "deepen ")) {
568 depth = strtol(line + 7, &end, 0);
569 if (end == line + 7 || depth <= 0)
570 die("Invalid deepen: %s", line);
573 if (!starts_with(line, "want ") ||
574 get_sha1_hex(line+5, sha1_buf))
575 die("git upload-pack: protocol error, "
576 "expected to get sha, not '%s'", line);
578 features = line + 45;
580 if (parse_feature_request(features, "multi_ack_detailed"))
582 else if (parse_feature_request(features, "multi_ack"))
584 if (parse_feature_request(features, "no-done"))
586 if (parse_feature_request(features, "thin-pack"))
588 if (parse_feature_request(features, "ofs-delta"))
590 if (parse_feature_request(features, "side-band-64k"))
591 use_sideband = LARGE_PACKET_MAX;
592 else if (parse_feature_request(features, "side-band"))
593 use_sideband = DEFAULT_PACKET_MAX;
594 if (parse_feature_request(features, "no-progress"))
596 if (parse_feature_request(features, "include-tag"))
599 o = parse_object(sha1_buf);
601 die("git upload-pack: not our ref %s",
602 sha1_to_hex(sha1_buf));
603 if (!(o->flags & WANTED)) {
607 add_object_array(o, NULL, &want_obj);
612 * We have sent all our refs already, and the other end
613 * should have chosen out of them. When we are operating
614 * in the stateless RPC mode, however, their choice may
615 * have been based on the set of older refs advertised
616 * by another process that handled the initial request.
621 if (!use_sideband && daemon_mode)
624 if (depth == 0 && shallows.nr == 0)
627 struct commit_list *result = NULL, *backup = NULL;
629 if (depth == INFINITE_DEPTH && !is_repository_shallow())
630 for (i = 0; i < shallows.nr; i++) {
631 struct object *object = shallows.objects[i].item;
632 object->flags |= NOT_SHALLOW;
636 get_shallow_commits(&want_obj, depth,
637 SHALLOW, NOT_SHALLOW);
639 struct object *object = &result->item->object;
640 if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) {
641 packet_write(1, "shallow %s",
642 oid_to_hex(&object->oid));
643 register_shallow(object->oid.hash);
646 result = result->next;
648 free_commit_list(backup);
649 for (i = 0; i < shallows.nr; i++) {
650 struct object *object = shallows.objects[i].item;
651 if (object->flags & NOT_SHALLOW) {
652 struct commit_list *parents;
653 packet_write(1, "unshallow %s",
654 oid_to_hex(&object->oid));
655 object->flags &= ~CLIENT_SHALLOW;
656 /* make sure the real parents are parsed */
657 unregister_shallow(object->oid.hash);
659 parse_commit_or_die((struct commit *)object);
660 parents = ((struct commit *)object)->parents;
662 add_object_array(&parents->item->object,
664 parents = parents->next;
666 add_object_array(object, NULL, &extra_edge_obj);
668 /* make sure commit traversal conforms to client */
669 register_shallow(object->oid.hash);
673 if (shallows.nr > 0) {
675 for (i = 0; i < shallows.nr; i++)
676 register_shallow(shallows.objects[i].item->oid.hash);
679 shallow_nr += shallows.nr;
680 free(shallows.objects);
683 /* return non-zero if the ref is hidden, otherwise 0 */
684 static int mark_our_ref(const char *refname, const char *refname_full,
685 const struct object_id *oid)
687 struct object *o = lookup_unknown_object(oid->hash);
689 if (ref_is_hidden(refname, refname_full)) {
690 o->flags |= HIDDEN_REF;
697 static int check_ref(const char *refname_full, const struct object_id *oid,
698 int flag, void *cb_data)
700 const char *refname = strip_namespace(refname_full);
702 mark_our_ref(refname, refname_full, oid);
706 static void format_symref_info(struct strbuf *buf, struct string_list *symref)
708 struct string_list_item *item;
712 for_each_string_list_item(item, symref)
713 strbuf_addf(buf, " symref=%s:%s", item->string, (char *)item->util);
716 static int send_ref(const char *refname, const struct object_id *oid,
717 int flag, void *cb_data)
719 static const char *capabilities = "multi_ack thin-pack side-band"
720 " side-band-64k ofs-delta shallow no-progress"
721 " include-tag multi_ack_detailed";
722 const char *refname_nons = strip_namespace(refname);
723 struct object_id peeled;
725 if (mark_our_ref(refname_nons, refname, oid))
729 struct strbuf symref_info = STRBUF_INIT;
731 format_symref_info(&symref_info, cb_data);
732 packet_write(1, "%s %s%c%s%s%s%s%s agent=%s\n",
733 oid_to_hex(oid), refname_nons,
735 (allow_unadvertised_object_request & ALLOW_TIP_SHA1) ?
736 " allow-tip-sha1-in-want" : "",
737 (allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1) ?
738 " allow-reachable-sha1-in-want" : "",
739 stateless_rpc ? " no-done" : "",
741 git_user_agent_sanitized());
742 strbuf_release(&symref_info);
744 packet_write(1, "%s %s\n", oid_to_hex(oid), refname_nons);
747 if (!peel_ref(refname, peeled.hash))
748 packet_write(1, "%s %s^{}\n", oid_to_hex(&peeled), refname_nons);
752 static int find_symref(const char *refname, const struct object_id *oid,
753 int flag, void *cb_data)
755 const char *symref_target;
756 struct string_list_item *item;
757 struct object_id unused;
759 if ((flag & REF_ISSYMREF) == 0)
761 symref_target = resolve_ref_unsafe(refname, 0, unused.hash, &flag);
762 if (!symref_target || (flag & REF_ISSYMREF) == 0)
763 die("'%s' is a symref but it is not?", refname);
764 item = string_list_append(cb_data, refname);
765 item->util = xstrdup(symref_target);
769 static void upload_pack(void)
771 struct string_list symref = STRING_LIST_INIT_DUP;
773 head_ref_namespaced(find_symref, &symref);
775 if (advertise_refs || !stateless_rpc) {
777 head_ref_namespaced(send_ref, &symref);
778 for_each_namespaced_ref(send_ref, &symref);
779 advertise_shallow_grafts(1);
782 head_ref_namespaced(check_ref, NULL);
783 for_each_namespaced_ref(check_ref, NULL);
785 string_list_clear(&symref, 1);
791 get_common_commits();
796 static int upload_pack_config(const char *var, const char *value, void *unused)
798 if (!strcmp("uploadpack.allowtipsha1inwant", var)) {
799 if (git_config_bool(var, value))
800 allow_unadvertised_object_request |= ALLOW_TIP_SHA1;
802 allow_unadvertised_object_request &= ~ALLOW_TIP_SHA1;
803 } else if (!strcmp("uploadpack.allowreachablesha1inwant", var)) {
804 if (git_config_bool(var, value))
805 allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1;
807 allow_unadvertised_object_request &= ~ALLOW_REACHABLE_SHA1;
808 } else if (!strcmp("uploadpack.keepalive", var)) {
809 keepalive = git_config_int(var, value);
813 return parse_hide_refs_config(var, value, "uploadpack");
816 int cmd_main(int argc, const char **argv)
822 packet_trace_identity("upload-pack");
823 check_replace_refs = 0;
825 for (i = 1; i < argc; i++) {
826 const char *arg = argv[i];
830 if (!strcmp(arg, "--advertise-refs")) {
834 if (!strcmp(arg, "--stateless-rpc")) {
838 if (!strcmp(arg, "--strict")) {
842 if (starts_with(arg, "--timeout=")) {
843 timeout = atoi(arg+10);
847 if (!strcmp(arg, "--")) {
854 usage(upload_pack_usage);
860 if (!enter_repo(dir, strict))
861 die("'%s' does not appear to be a git repository", dir);
863 git_config(upload_pack_config, NULL);