6 #include "repository.h"
7 #include "object-store.h"
13 #include "list-objects.h"
14 #include "list-objects-filter.h"
15 #include "list-objects-filter-options.h"
16 #include "run-command.h"
20 #include "string-list.h"
21 #include "argv-array.h"
22 #include "prio-queue.h"
25 #include "upload-pack.h"
27 #include "commit-graph.h"
28 #include "commit-reach.h"
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)
37 #define SHALLOW (1u << 16)
38 #define NOT_SHALLOW (1u << 17)
39 #define CLIENT_SHALLOW (1u << 18)
40 #define HIDDEN_REF (1u << 19)
42 #define ALL_FLAGS (THEY_HAVE | OUR_REF | WANTED | COMMON_KNOWN | SHALLOW | \
43 NOT_SHALLOW | CLIENT_SHALLOW | HIDDEN_REF)
45 static timestamp_t oldest_have;
47 /* Allow specifying sha1 if it is a ref tip. */
48 #define ALLOW_TIP_SHA1 01
49 /* Allow request of a sha1 if it is reachable from a ref (possibly hidden ref). */
50 #define ALLOW_REACHABLE_SHA1 02
51 /* Allow request of any sha1. Implies ALLOW_TIP_SHA1 and ALLOW_REACHABLE_SHA1. */
52 #define ALLOW_ANY_SHA1 07
53 static unsigned int allow_unadvertised_object_request;
54 static int shallow_nr;
55 static struct object_array extra_edge_obj;
56 static int keepalive = 5;
57 static const char *pack_objects_hook;
59 static int allow_filter;
60 static int allow_ref_in_want;
62 static int allow_sideband_all;
65 * Please annotate, and if possible group together, fields used only
66 * for protocol v0 or only for protocol v2.
68 struct upload_pack_data {
69 struct string_list symref; /* v0 only */
70 struct object_array want_obj;
71 struct object_array have_obj;
72 struct oid_array haves; /* v2 only */
73 struct string_list wanted_refs; /* v2 only */
75 struct object_array shallows;
76 struct string_list deepen_not;
78 timestamp_t deepen_since;
82 unsigned int timeout; /* v0 only */
86 MULTI_ACK_DETAILED = 2
87 } multi_ack; /* v0 only */
89 /* 0 for no sideband, otherwise DEFAULT_PACKET_MAX or LARGE_PACKET_MAX */
92 struct list_objects_filter_options filter_options;
94 struct packet_writer writer;
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 */
101 unsigned use_thin_pack : 1;
102 unsigned use_ofs_delta : 1;
103 unsigned no_progress : 1;
104 unsigned use_include_tag : 1;
106 unsigned done : 1; /* v2 only */
109 static void upload_pack_data_init(struct upload_pack_data *data)
111 struct string_list symref = STRING_LIST_INIT_DUP;
112 struct string_list wanted_refs = STRING_LIST_INIT_DUP;
113 struct object_array want_obj = OBJECT_ARRAY_INIT;
114 struct object_array have_obj = OBJECT_ARRAY_INIT;
115 struct oid_array haves = OID_ARRAY_INIT;
116 struct object_array shallows = OBJECT_ARRAY_INIT;
117 struct string_list deepen_not = STRING_LIST_INIT_DUP;
119 memset(data, 0, sizeof(*data));
120 data->symref = symref;
121 data->wanted_refs = wanted_refs;
122 data->want_obj = want_obj;
123 data->have_obj = have_obj;
125 data->shallows = shallows;
126 data->deepen_not = deepen_not;
127 packet_writer_init(&data->writer, 1);
130 static void upload_pack_data_clear(struct upload_pack_data *data)
132 string_list_clear(&data->symref, 1);
133 string_list_clear(&data->wanted_refs, 1);
134 object_array_clear(&data->want_obj);
135 object_array_clear(&data->have_obj);
136 oid_array_clear(&data->haves);
137 object_array_clear(&data->shallows);
138 string_list_clear(&data->deepen_not, 0);
139 list_objects_filter_release(&data->filter_options);
142 static void reset_timeout(unsigned int timeout)
147 static void send_client_data(int fd, const char *data, ssize_t sz,
151 send_sideband(1, fd, data, sz, use_sideband);
158 /* XXX: are we happy to lose stuff here? */
159 xwrite(fd, data, sz);
162 write_or_die(fd, data, sz);
165 static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
168 if (graft->nr_parent == -1)
169 fprintf(fp, "--shallow %s\n", oid_to_hex(&graft->oid));
173 static void create_pack_file(struct upload_pack_data *pack_data)
175 struct child_process pack_objects = CHILD_PROCESS_INIT;
176 char data[8193], progress[128];
177 char abort_msg[] = "aborting due to possible repository "
178 "corruption on the remote side.";
184 if (!pack_objects_hook)
185 pack_objects.git_cmd = 1;
187 argv_array_push(&pack_objects.args, pack_objects_hook);
188 argv_array_push(&pack_objects.args, "git");
189 pack_objects.use_shell = 1;
193 argv_array_push(&pack_objects.args, "--shallow-file");
194 argv_array_push(&pack_objects.args, "");
196 argv_array_push(&pack_objects.args, "pack-objects");
197 argv_array_push(&pack_objects.args, "--revs");
198 if (pack_data->use_thin_pack)
199 argv_array_push(&pack_objects.args, "--thin");
201 argv_array_push(&pack_objects.args, "--stdout");
203 argv_array_push(&pack_objects.args, "--shallow");
204 if (!pack_data->no_progress)
205 argv_array_push(&pack_objects.args, "--progress");
206 if (pack_data->use_ofs_delta)
207 argv_array_push(&pack_objects.args, "--delta-base-offset");
208 if (pack_data->use_include_tag)
209 argv_array_push(&pack_objects.args, "--include-tag");
210 if (pack_data->filter_options.choice) {
212 expand_list_objects_filter_spec(&pack_data->filter_options);
213 if (pack_objects.use_shell) {
214 struct strbuf buf = STRBUF_INIT;
215 sq_quote_buf(&buf, spec);
216 argv_array_pushf(&pack_objects.args, "--filter=%s", buf.buf);
217 strbuf_release(&buf);
219 argv_array_pushf(&pack_objects.args, "--filter=%s",
224 pack_objects.in = -1;
225 pack_objects.out = -1;
226 pack_objects.err = -1;
228 if (start_command(&pack_objects))
229 die("git upload-pack: unable to fork git-pack-objects");
231 pipe_fd = xfdopen(pack_objects.in, "w");
234 for_each_commit_graft(write_one_shallow, pipe_fd);
236 for (i = 0; i < pack_data->want_obj.nr; i++)
237 fprintf(pipe_fd, "%s\n",
238 oid_to_hex(&pack_data->want_obj.objects[i].item->oid));
239 fprintf(pipe_fd, "--not\n");
240 for (i = 0; i < pack_data->have_obj.nr; i++)
241 fprintf(pipe_fd, "%s\n",
242 oid_to_hex(&pack_data->have_obj.objects[i].item->oid));
243 for (i = 0; i < extra_edge_obj.nr; i++)
244 fprintf(pipe_fd, "%s\n",
245 oid_to_hex(&extra_edge_obj.objects[i].item->oid));
246 fprintf(pipe_fd, "\n");
250 /* We read from pack_objects.err to capture stderr output for
251 * progress bar, and pack_objects.out to capture the pack data.
255 struct pollfd pfd[2];
256 int pe, pu, pollsize;
259 reset_timeout(pack_data->timeout);
264 if (0 <= pack_objects.out) {
265 pfd[pollsize].fd = pack_objects.out;
266 pfd[pollsize].events = POLLIN;
270 if (0 <= pack_objects.err) {
271 pfd[pollsize].fd = pack_objects.err;
272 pfd[pollsize].events = POLLIN;
280 ret = poll(pfd, pollsize,
281 keepalive < 0 ? -1 : 1000 * keepalive);
284 if (errno != EINTR) {
285 error_errno("poll failed, resuming");
290 if (0 <= pe && (pfd[pe].revents & (POLLIN|POLLHUP))) {
291 /* Status ready; we ship that in the side-band
292 * or dump to the standard error.
294 sz = xread(pack_objects.err, progress,
297 send_client_data(2, progress, sz,
298 pack_data->use_sideband);
300 close(pack_objects.err);
301 pack_objects.err = -1;
305 /* give priority to status messages */
308 if (0 <= pu && (pfd[pu].revents & (POLLIN|POLLHUP))) {
309 /* Data ready; we keep the last byte to ourselves
310 * in case we detect broken rev-list, so that we
311 * can leave the stream corrupted. This is
312 * unfortunate -- unpack-objects would happily
313 * accept a valid packdata with trailing garbage,
314 * so appending garbage after we pass all the
315 * pack data is not good enough to signal
316 * breakage to downstream.
324 sz = xread(pack_objects.out, cp,
325 sizeof(data) - outsz);
329 close(pack_objects.out);
330 pack_objects.out = -1;
336 buffered = data[sz-1] & 0xFF;
341 send_client_data(1, data, sz,
342 pack_data->use_sideband);
346 * We hit the keepalive timeout without saying anything; send
347 * an empty message on the data sideband just to let the other
348 * side know we're still working on it, but don't have any data
351 * If we don't have a sideband channel, there's no room in the
352 * protocol to say anything, so those clients are just out of
355 if (!ret && pack_data->use_sideband) {
356 static const char buf[] = "0005\1";
357 write_or_die(1, buf, 5);
361 if (finish_command(&pack_objects)) {
362 error("git upload-pack: git-pack-objects died with error.");
369 send_client_data(1, data, 1,
370 pack_data->use_sideband);
371 fprintf(stderr, "flushed.\n");
373 if (pack_data->use_sideband)
378 send_client_data(3, abort_msg, sizeof(abort_msg),
379 pack_data->use_sideband);
380 die("git upload-pack: %s", abort_msg);
383 static int got_oid(const char *hex, struct object_id *oid,
384 struct object_array *have_obj)
387 int we_knew_they_have = 0;
389 if (get_oid_hex(hex, oid))
390 die("git upload-pack: expected SHA1 object, got '%s'", hex);
391 if (!has_object_file(oid))
394 o = parse_object(the_repository, oid);
396 die("oops (%s)", oid_to_hex(oid));
397 if (o->type == OBJ_COMMIT) {
398 struct commit_list *parents;
399 struct commit *commit = (struct commit *)o;
400 if (o->flags & THEY_HAVE)
401 we_knew_they_have = 1;
403 o->flags |= THEY_HAVE;
404 if (!oldest_have || (commit->date < oldest_have))
405 oldest_have = commit->date;
406 for (parents = commit->parents;
408 parents = parents->next)
409 parents->item->object.flags |= THEY_HAVE;
411 if (!we_knew_they_have) {
412 add_object_array(o, NULL, have_obj);
418 static int ok_to_give_up(const struct object_array *have_obj,
419 struct object_array *want_obj)
421 uint32_t min_generation = GENERATION_NUMBER_ZERO;
426 return can_all_from_reach_with_flag(want_obj, THEY_HAVE,
427 COMMON_KNOWN, oldest_have,
431 static int get_common_commits(struct upload_pack_data *data,
432 struct packet_reader *reader)
434 struct object_id oid;
435 char last_hex[GIT_MAX_HEXSZ + 1];
440 save_commit_buffer = 0;
445 reset_timeout(data->timeout);
447 if (packet_reader_read(reader) != PACKET_READ_NORMAL) {
448 if (data->multi_ack == MULTI_ACK_DETAILED
451 && ok_to_give_up(&data->have_obj, &data->want_obj)) {
453 packet_write_fmt(1, "ACK %s ready\n", last_hex);
455 if (data->have_obj.nr == 0 || data->multi_ack)
456 packet_write_fmt(1, "NAK\n");
458 if (data->no_done && sent_ready) {
459 packet_write_fmt(1, "ACK %s\n", last_hex);
462 if (data->stateless_rpc)
468 if (skip_prefix(reader->line, "have ", &arg)) {
469 switch (got_oid(arg, &oid, &data->have_obj)) {
470 case -1: /* they have what we do not */
473 && ok_to_give_up(&data->have_obj, &data->want_obj)) {
474 const char *hex = oid_to_hex(&oid);
475 if (data->multi_ack == MULTI_ACK_DETAILED) {
477 packet_write_fmt(1, "ACK %s ready\n", hex);
479 packet_write_fmt(1, "ACK %s continue\n", hex);
484 oid_to_hex_r(last_hex, &oid);
485 if (data->multi_ack == MULTI_ACK_DETAILED)
486 packet_write_fmt(1, "ACK %s common\n", last_hex);
487 else if (data->multi_ack)
488 packet_write_fmt(1, "ACK %s continue\n", last_hex);
489 else if (data->have_obj.nr == 1)
490 packet_write_fmt(1, "ACK %s\n", last_hex);
495 if (!strcmp(reader->line, "done")) {
496 if (data->have_obj.nr > 0) {
498 packet_write_fmt(1, "ACK %s\n", last_hex);
501 packet_write_fmt(1, "NAK\n");
504 die("git upload-pack: expected SHA1 list, got '%s'", reader->line);
508 static int is_our_ref(struct object *o)
510 int allow_hidden_ref = (allow_unadvertised_object_request &
511 (ALLOW_TIP_SHA1 | ALLOW_REACHABLE_SHA1));
512 return o->flags & ((allow_hidden_ref ? HIDDEN_REF : 0) | OUR_REF);
516 * on successful case, it's up to the caller to close cmd->out
518 static int do_reachable_revlist(struct child_process *cmd,
519 struct object_array *src,
520 struct object_array *reachable)
522 static const char *argv[] = {
523 "rev-list", "--stdin", NULL,
526 char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */
528 const unsigned hexsz = the_hash_algo->hexsz;
537 * If the next rev-list --stdin encounters an unknown commit,
538 * it terminates, which will cause SIGPIPE in the write loop
541 sigchain_push(SIGPIPE, SIG_IGN);
543 if (start_command(cmd))
547 namebuf[hexsz + 1] = '\n';
548 for (i = get_max_object_index(); 0 < i; ) {
549 o = get_indexed_object(--i);
552 if (reachable && o->type == OBJ_COMMIT)
553 o->flags &= ~TMP_MARK;
556 memcpy(namebuf + 1, oid_to_hex(&o->oid), hexsz);
557 if (write_in_full(cmd->in, namebuf, hexsz + 2) < 0)
560 namebuf[hexsz] = '\n';
561 for (i = 0; i < src->nr; i++) {
562 o = src->objects[i].item;
565 add_object_array(o, NULL, reachable);
568 if (reachable && o->type == OBJ_COMMIT)
569 o->flags |= TMP_MARK;
570 memcpy(namebuf, oid_to_hex(&o->oid), hexsz);
571 if (write_in_full(cmd->in, namebuf, hexsz + 1) < 0)
576 sigchain_pop(SIGPIPE);
581 sigchain_pop(SIGPIPE);
590 static int get_reachable_list(struct object_array *src,
591 struct object_array *reachable)
593 struct child_process cmd = CHILD_PROCESS_INIT;
596 char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */
597 const unsigned hexsz = the_hash_algo->hexsz;
599 if (do_reachable_revlist(&cmd, src, reachable) < 0)
602 while ((i = read_in_full(cmd.out, namebuf, hexsz + 1)) == hexsz + 1) {
603 struct object_id oid;
606 if (parse_oid_hex(namebuf, &oid, &p) || *p != '\n')
609 o = lookup_object(the_repository, &oid);
610 if (o && o->type == OBJ_COMMIT) {
611 o->flags &= ~TMP_MARK;
614 for (i = get_max_object_index(); 0 < i; i--) {
615 o = get_indexed_object(i - 1);
616 if (o && o->type == OBJ_COMMIT &&
617 (o->flags & TMP_MARK)) {
618 add_object_array(o, NULL, reachable);
619 o->flags &= ~TMP_MARK;
624 if (finish_command(&cmd))
630 static int has_unreachable(struct object_array *src)
632 struct child_process cmd = CHILD_PROCESS_INIT;
636 if (do_reachable_revlist(&cmd, src, NULL) < 0)
640 * The commits out of the rev-list are not ancestors of
643 i = read_in_full(cmd.out, buf, 1);
650 * rev-list may have died by encountering a bad commit
651 * in the history, in which case we do want to bail out
652 * even when it showed no commit.
654 if (finish_command(&cmd))
657 /* All the non-tip ones are ancestors of what we advertised */
661 sigchain_pop(SIGPIPE);
667 static void check_non_tip(struct upload_pack_data *data)
672 * In the normal in-process case without
673 * uploadpack.allowReachableSHA1InWant,
674 * non-tip requests can never happen.
676 if (!data->stateless_rpc
677 && !(allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1))
679 if (!has_unreachable(&data->want_obj))
680 /* All the non-tip ones are ancestors of what we advertised */
684 /* Pick one of them (we know there at least is one) */
685 for (i = 0; i < data->want_obj.nr; i++) {
686 struct object *o = data->want_obj.objects[i].item;
687 if (!is_our_ref(o)) {
688 packet_writer_error(&data->writer,
689 "upload-pack: not our ref %s",
690 oid_to_hex(&o->oid));
691 die("git upload-pack: not our ref %s",
692 oid_to_hex(&o->oid));
697 static void send_shallow(struct packet_writer *writer,
698 struct commit_list *result)
701 struct object *object = &result->item->object;
702 if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) {
703 packet_writer_write(writer, "shallow %s",
704 oid_to_hex(&object->oid));
705 register_shallow(the_repository, &object->oid);
708 result = result->next;
712 static void send_unshallow(struct packet_writer *writer,
713 const struct object_array *shallows,
714 struct object_array *want_obj)
718 for (i = 0; i < shallows->nr; i++) {
719 struct object *object = shallows->objects[i].item;
720 if (object->flags & NOT_SHALLOW) {
721 struct commit_list *parents;
722 packet_writer_write(writer, "unshallow %s",
723 oid_to_hex(&object->oid));
724 object->flags &= ~CLIENT_SHALLOW;
726 * We want to _register_ "object" as shallow, but we
727 * also need to traverse object's parents to deepen a
728 * shallow clone. Unregister it for now so we can
729 * parse and add the parents to the want list, then
732 unregister_shallow(&object->oid);
734 parse_commit_or_die((struct commit *)object);
735 parents = ((struct commit *)object)->parents;
737 add_object_array(&parents->item->object,
739 parents = parents->next;
741 add_object_array(object, NULL, &extra_edge_obj);
743 /* make sure commit traversal conforms to client */
744 register_shallow(the_repository, &object->oid);
748 static int check_ref(const char *refname_full, const struct object_id *oid,
749 int flag, void *cb_data);
750 static void deepen(struct packet_writer *writer, int depth, int deepen_relative,
751 struct object_array *shallows, struct object_array *want_obj)
753 if (depth == INFINITE_DEPTH && !is_repository_shallow(the_repository)) {
756 for (i = 0; i < shallows->nr; i++) {
757 struct object *object = shallows->objects[i].item;
758 object->flags |= NOT_SHALLOW;
760 } else if (deepen_relative) {
761 struct object_array reachable_shallows = OBJECT_ARRAY_INIT;
762 struct commit_list *result;
765 * Checking for reachable shallows requires that our refs be
766 * marked with OUR_REF.
768 head_ref_namespaced(check_ref, NULL);
769 for_each_namespaced_ref(check_ref, NULL);
771 get_reachable_list(shallows, &reachable_shallows);
772 result = get_shallow_commits(&reachable_shallows,
774 SHALLOW, NOT_SHALLOW);
775 send_shallow(writer, result);
776 free_commit_list(result);
777 object_array_clear(&reachable_shallows);
779 struct commit_list *result;
781 result = get_shallow_commits(want_obj, depth,
782 SHALLOW, NOT_SHALLOW);
783 send_shallow(writer, result);
784 free_commit_list(result);
787 send_unshallow(writer, shallows, want_obj);
790 static void deepen_by_rev_list(struct packet_writer *writer, int ac,
792 struct object_array *shallows,
793 struct object_array *want_obj)
795 struct commit_list *result;
797 disable_commit_graph(the_repository);
798 result = get_shallow_commits_by_rev_list(ac, av, SHALLOW, NOT_SHALLOW);
799 send_shallow(writer, result);
800 free_commit_list(result);
801 send_unshallow(writer, shallows, want_obj);
804 /* Returns 1 if a shallow list is sent or 0 otherwise */
805 static int send_shallow_list(struct packet_writer *writer,
806 int depth, int deepen_rev_list,
807 timestamp_t deepen_since,
808 struct string_list *deepen_not,
810 struct object_array *shallows,
811 struct object_array *want_obj)
815 if (depth > 0 && deepen_rev_list)
816 die("git upload-pack: deepen and deepen-since (or deepen-not) cannot be used together");
818 deepen(writer, depth, deepen_relative, shallows, want_obj);
820 } else if (deepen_rev_list) {
821 struct argv_array av = ARGV_ARRAY_INIT;
824 argv_array_push(&av, "rev-list");
826 argv_array_pushf(&av, "--max-age=%"PRItime, deepen_since);
827 if (deepen_not->nr) {
828 argv_array_push(&av, "--not");
829 for (i = 0; i < deepen_not->nr; i++) {
830 struct string_list_item *s = deepen_not->items + i;
831 argv_array_push(&av, s->string);
833 argv_array_push(&av, "--not");
835 for (i = 0; i < want_obj->nr; i++) {
836 struct object *o = want_obj->objects[i].item;
837 argv_array_push(&av, oid_to_hex(&o->oid));
839 deepen_by_rev_list(writer, av.argc, av.argv, shallows, want_obj);
840 argv_array_clear(&av);
843 if (shallows->nr > 0) {
845 for (i = 0; i < shallows->nr; i++)
846 register_shallow(the_repository,
847 &shallows->objects[i].item->oid);
851 shallow_nr += shallows->nr;
855 static int process_shallow(const char *line, struct object_array *shallows)
858 if (skip_prefix(line, "shallow ", &arg)) {
859 struct object_id oid;
860 struct object *object;
861 if (get_oid_hex(arg, &oid))
862 die("invalid shallow line: %s", line);
863 object = parse_object(the_repository, &oid);
866 if (object->type != OBJ_COMMIT)
867 die("invalid shallow object %s", oid_to_hex(&oid));
868 if (!(object->flags & CLIENT_SHALLOW)) {
869 object->flags |= CLIENT_SHALLOW;
870 add_object_array(object, NULL, shallows);
878 static int process_deepen(const char *line, int *depth)
881 if (skip_prefix(line, "deepen ", &arg)) {
883 *depth = (int)strtol(arg, &end, 0);
884 if (!end || *end || *depth <= 0)
885 die("Invalid deepen: %s", line);
892 static int process_deepen_since(const char *line, timestamp_t *deepen_since, int *deepen_rev_list)
895 if (skip_prefix(line, "deepen-since ", &arg)) {
897 *deepen_since = parse_timestamp(arg, &end, 0);
898 if (!end || *end || !deepen_since ||
899 /* revisions.c's max_age -1 is special */
901 die("Invalid deepen-since: %s", line);
902 *deepen_rev_list = 1;
908 static int process_deepen_not(const char *line, struct string_list *deepen_not, int *deepen_rev_list)
911 if (skip_prefix(line, "deepen-not ", &arg)) {
913 struct object_id oid;
914 if (expand_ref(the_repository, arg, strlen(arg), &oid, &ref) != 1)
915 die("git upload-pack: ambiguous deepen-not: %s", line);
916 string_list_append(deepen_not, ref);
918 *deepen_rev_list = 1;
924 static void receive_needs(struct upload_pack_data *data,
925 struct packet_reader *reader)
932 const char *features;
933 struct object_id oid_buf;
936 reset_timeout(data->timeout);
937 if (packet_reader_read(reader) != PACKET_READ_NORMAL)
940 if (process_shallow(reader->line, &data->shallows))
942 if (process_deepen(reader->line, &data->depth))
944 if (process_deepen_since(reader->line, &data->deepen_since, &data->deepen_rev_list))
946 if (process_deepen_not(reader->line, &data->deepen_not, &data->deepen_rev_list))
949 if (skip_prefix(reader->line, "filter ", &arg)) {
950 if (!data->filter_capability_requested)
951 die("git upload-pack: filtering capability not negotiated");
952 list_objects_filter_die_if_populated(&data->filter_options);
953 parse_list_objects_filter(&data->filter_options, arg);
957 if (!skip_prefix(reader->line, "want ", &arg) ||
958 parse_oid_hex(arg, &oid_buf, &features))
959 die("git upload-pack: protocol error, "
960 "expected to get object ID, not '%s'", reader->line);
962 if (parse_feature_request(features, "deepen-relative"))
963 data->deepen_relative = 1;
964 if (parse_feature_request(features, "multi_ack_detailed"))
965 data->multi_ack = MULTI_ACK_DETAILED;
966 else if (parse_feature_request(features, "multi_ack"))
967 data->multi_ack = MULTI_ACK;
968 if (parse_feature_request(features, "no-done"))
970 if (parse_feature_request(features, "thin-pack"))
971 data->use_thin_pack = 1;
972 if (parse_feature_request(features, "ofs-delta"))
973 data->use_ofs_delta = 1;
974 if (parse_feature_request(features, "side-band-64k"))
975 data->use_sideband = LARGE_PACKET_MAX;
976 else if (parse_feature_request(features, "side-band"))
977 data->use_sideband = DEFAULT_PACKET_MAX;
978 if (parse_feature_request(features, "no-progress"))
979 data->no_progress = 1;
980 if (parse_feature_request(features, "include-tag"))
981 data->use_include_tag = 1;
982 if (allow_filter && parse_feature_request(features, "filter"))
983 data->filter_capability_requested = 1;
985 o = parse_object(the_repository, &oid_buf);
987 packet_writer_error(&data->writer,
988 "upload-pack: not our ref %s",
989 oid_to_hex(&oid_buf));
990 die("git upload-pack: not our ref %s",
991 oid_to_hex(&oid_buf));
993 if (!(o->flags & WANTED)) {
995 if (!((allow_unadvertised_object_request & ALLOW_ANY_SHA1) == ALLOW_ANY_SHA1
998 add_object_array(o, NULL, &data->want_obj);
1003 * We have sent all our refs already, and the other end
1004 * should have chosen out of them. When we are operating
1005 * in the stateless RPC mode, however, their choice may
1006 * have been based on the set of older refs advertised
1007 * by another process that handled the initial request.
1010 check_non_tip(data);
1012 if (!data->use_sideband && data->daemon_mode)
1013 data->no_progress = 1;
1015 if (data->depth == 0 && !data->deepen_rev_list && data->shallows.nr == 0)
1018 if (send_shallow_list(&data->writer,
1020 data->deepen_rev_list,
1023 data->deepen_relative,
1029 /* return non-zero if the ref is hidden, otherwise 0 */
1030 static int mark_our_ref(const char *refname, const char *refname_full,
1031 const struct object_id *oid)
1033 struct object *o = lookup_unknown_object(oid);
1035 if (ref_is_hidden(refname, refname_full)) {
1036 o->flags |= HIDDEN_REF;
1039 o->flags |= OUR_REF;
1043 static int check_ref(const char *refname_full, const struct object_id *oid,
1044 int flag, void *cb_data)
1046 const char *refname = strip_namespace(refname_full);
1048 mark_our_ref(refname, refname_full, oid);
1052 static void format_symref_info(struct strbuf *buf, struct string_list *symref)
1054 struct string_list_item *item;
1058 for_each_string_list_item(item, symref)
1059 strbuf_addf(buf, " symref=%s:%s", item->string, (char *)item->util);
1062 static int send_ref(const char *refname, const struct object_id *oid,
1063 int flag, void *cb_data)
1065 static const char *capabilities = "multi_ack thin-pack side-band"
1066 " side-band-64k ofs-delta shallow deepen-since deepen-not"
1067 " deepen-relative no-progress include-tag multi_ack_detailed";
1068 const char *refname_nons = strip_namespace(refname);
1069 struct object_id peeled;
1070 struct upload_pack_data *data = cb_data;
1072 if (mark_our_ref(refname_nons, refname, oid))
1076 struct strbuf symref_info = STRBUF_INIT;
1078 format_symref_info(&symref_info, &data->symref);
1079 packet_write_fmt(1, "%s %s%c%s%s%s%s%s%s agent=%s\n",
1080 oid_to_hex(oid), refname_nons,
1082 (allow_unadvertised_object_request & ALLOW_TIP_SHA1) ?
1083 " allow-tip-sha1-in-want" : "",
1084 (allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1) ?
1085 " allow-reachable-sha1-in-want" : "",
1086 data->stateless_rpc ? " no-done" : "",
1088 allow_filter ? " filter" : "",
1089 git_user_agent_sanitized());
1090 strbuf_release(&symref_info);
1092 packet_write_fmt(1, "%s %s\n", oid_to_hex(oid), refname_nons);
1094 capabilities = NULL;
1095 if (!peel_ref(refname, &peeled))
1096 packet_write_fmt(1, "%s %s^{}\n", oid_to_hex(&peeled), refname_nons);
1100 static int find_symref(const char *refname, const struct object_id *oid,
1101 int flag, void *cb_data)
1103 const char *symref_target;
1104 struct string_list_item *item;
1106 if ((flag & REF_ISSYMREF) == 0)
1108 symref_target = resolve_ref_unsafe(refname, 0, NULL, &flag);
1109 if (!symref_target || (flag & REF_ISSYMREF) == 0)
1110 die("'%s' is a symref but it is not?", refname);
1111 item = string_list_append(cb_data, strip_namespace(refname));
1112 item->util = xstrdup(strip_namespace(symref_target));
1116 static int upload_pack_config(const char *var, const char *value, void *unused)
1118 if (!strcmp("uploadpack.allowtipsha1inwant", var)) {
1119 if (git_config_bool(var, value))
1120 allow_unadvertised_object_request |= ALLOW_TIP_SHA1;
1122 allow_unadvertised_object_request &= ~ALLOW_TIP_SHA1;
1123 } else if (!strcmp("uploadpack.allowreachablesha1inwant", var)) {
1124 if (git_config_bool(var, value))
1125 allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1;
1127 allow_unadvertised_object_request &= ~ALLOW_REACHABLE_SHA1;
1128 } else if (!strcmp("uploadpack.allowanysha1inwant", var)) {
1129 if (git_config_bool(var, value))
1130 allow_unadvertised_object_request |= ALLOW_ANY_SHA1;
1132 allow_unadvertised_object_request &= ~ALLOW_ANY_SHA1;
1133 } else if (!strcmp("uploadpack.keepalive", var)) {
1134 keepalive = git_config_int(var, value);
1137 } else if (!strcmp("uploadpack.allowfilter", var)) {
1138 allow_filter = git_config_bool(var, value);
1139 } else if (!strcmp("uploadpack.allowrefinwant", var)) {
1140 allow_ref_in_want = git_config_bool(var, value);
1141 } else if (!strcmp("uploadpack.allowsidebandall", var)) {
1142 allow_sideband_all = git_config_bool(var, value);
1143 } else if (!strcmp("core.precomposeunicode", var)) {
1144 precomposed_unicode = git_config_bool(var, value);
1147 if (current_config_scope() != CONFIG_SCOPE_LOCAL &&
1148 current_config_scope() != CONFIG_SCOPE_WORKTREE) {
1149 if (!strcmp("uploadpack.packobjectshook", var))
1150 return git_config_string(&pack_objects_hook, var, value);
1153 return parse_hide_refs_config(var, value, "uploadpack");
1156 void upload_pack(struct upload_pack_options *options)
1158 struct packet_reader reader;
1159 struct upload_pack_data data;
1161 git_config(upload_pack_config, NULL);
1163 upload_pack_data_init(&data);
1165 data.stateless_rpc = options->stateless_rpc;
1166 data.daemon_mode = options->daemon_mode;
1167 data.timeout = options->timeout;
1169 head_ref_namespaced(find_symref, &data.symref);
1171 if (options->advertise_refs || !data.stateless_rpc) {
1172 reset_timeout(data.timeout);
1173 head_ref_namespaced(send_ref, &data);
1174 for_each_namespaced_ref(send_ref, &data);
1175 advertise_shallow_grafts(1);
1178 head_ref_namespaced(check_ref, NULL);
1179 for_each_namespaced_ref(check_ref, NULL);
1182 if (!options->advertise_refs) {
1183 packet_reader_init(&reader, 0, NULL, 0,
1184 PACKET_READ_CHOMP_NEWLINE |
1185 PACKET_READ_DIE_ON_ERR_PACKET);
1187 receive_needs(&data, &reader);
1188 if (data.want_obj.nr) {
1189 get_common_commits(&data, &reader);
1190 create_pack_file(&data);
1194 upload_pack_data_clear(&data);
1197 static int parse_want(struct packet_writer *writer, const char *line,
1198 struct object_array *want_obj)
1201 if (skip_prefix(line, "want ", &arg)) {
1202 struct object_id oid;
1205 if (get_oid_hex(arg, &oid))
1206 die("git upload-pack: protocol error, "
1207 "expected to get oid, not '%s'", line);
1209 o = parse_object(the_repository, &oid);
1211 packet_writer_error(writer,
1212 "upload-pack: not our ref %s",
1214 die("git upload-pack: not our ref %s",
1218 if (!(o->flags & WANTED)) {
1220 add_object_array(o, NULL, want_obj);
1229 static int parse_want_ref(struct packet_writer *writer, const char *line,
1230 struct string_list *wanted_refs,
1231 struct object_array *want_obj)
1234 if (skip_prefix(line, "want-ref ", &arg)) {
1235 struct object_id oid;
1236 struct string_list_item *item;
1239 if (read_ref(arg, &oid)) {
1240 packet_writer_error(writer, "unknown ref %s", arg);
1241 die("unknown ref %s", arg);
1244 item = string_list_append(wanted_refs, arg);
1245 item->util = oiddup(&oid);
1247 o = parse_object_or_die(&oid, arg);
1248 if (!(o->flags & WANTED)) {
1250 add_object_array(o, NULL, want_obj);
1259 static int parse_have(const char *line, struct oid_array *haves)
1262 if (skip_prefix(line, "have ", &arg)) {
1263 struct object_id oid;
1265 if (get_oid_hex(arg, &oid))
1266 die("git upload-pack: expected SHA1 object, got '%s'", arg);
1267 oid_array_append(haves, &oid);
1274 static void process_args(struct packet_reader *request,
1275 struct upload_pack_data *data)
1277 while (packet_reader_read(request) == PACKET_READ_NORMAL) {
1278 const char *arg = request->line;
1282 if (parse_want(&data->writer, arg, &data->want_obj))
1284 if (allow_ref_in_want &&
1285 parse_want_ref(&data->writer, arg, &data->wanted_refs,
1288 /* process have line */
1289 if (parse_have(arg, &data->haves))
1292 /* process args like thin-pack */
1293 if (!strcmp(arg, "thin-pack")) {
1294 data->use_thin_pack = 1;
1297 if (!strcmp(arg, "ofs-delta")) {
1298 data->use_ofs_delta = 1;
1301 if (!strcmp(arg, "no-progress")) {
1302 data->no_progress = 1;
1305 if (!strcmp(arg, "include-tag")) {
1306 data->use_include_tag = 1;
1309 if (!strcmp(arg, "done")) {
1314 /* Shallow related arguments */
1315 if (process_shallow(arg, &data->shallows))
1317 if (process_deepen(arg, &data->depth))
1319 if (process_deepen_since(arg, &data->deepen_since,
1320 &data->deepen_rev_list))
1322 if (process_deepen_not(arg, &data->deepen_not,
1323 &data->deepen_rev_list))
1325 if (!strcmp(arg, "deepen-relative")) {
1326 data->deepen_relative = 1;
1330 if (allow_filter && skip_prefix(arg, "filter ", &p)) {
1331 list_objects_filter_die_if_populated(&data->filter_options);
1332 parse_list_objects_filter(&data->filter_options, p);
1336 if ((git_env_bool("GIT_TEST_SIDEBAND_ALL", 0) ||
1337 allow_sideband_all) &&
1338 !strcmp(arg, "sideband-all")) {
1339 data->writer.use_sideband = 1;
1343 /* ignore unknown lines maybe? */
1344 die("unexpected line: '%s'", arg);
1347 if (request->status != PACKET_READ_FLUSH)
1348 die(_("expected flush after fetch arguments"));
1351 static int process_haves(struct oid_array *haves, struct oid_array *common,
1352 struct object_array *have_obj)
1357 for (i = 0; i < haves->nr; i++) {
1358 const struct object_id *oid = &haves->oid[i];
1360 int we_knew_they_have = 0;
1362 if (!has_object_file(oid))
1365 oid_array_append(common, oid);
1367 o = parse_object(the_repository, oid);
1369 die("oops (%s)", oid_to_hex(oid));
1370 if (o->type == OBJ_COMMIT) {
1371 struct commit_list *parents;
1372 struct commit *commit = (struct commit *)o;
1373 if (o->flags & THEY_HAVE)
1374 we_knew_they_have = 1;
1376 o->flags |= THEY_HAVE;
1377 if (!oldest_have || (commit->date < oldest_have))
1378 oldest_have = commit->date;
1379 for (parents = commit->parents;
1381 parents = parents->next)
1382 parents->item->object.flags |= THEY_HAVE;
1384 if (!we_knew_they_have)
1385 add_object_array(o, NULL, have_obj);
1391 static int send_acks(struct packet_writer *writer, struct oid_array *acks,
1392 const struct object_array *have_obj,
1393 struct object_array *want_obj)
1397 packet_writer_write(writer, "acknowledgments\n");
1401 packet_writer_write(writer, "NAK\n");
1403 for (i = 0; i < acks->nr; i++) {
1404 packet_writer_write(writer, "ACK %s\n",
1405 oid_to_hex(&acks->oid[i]));
1408 if (ok_to_give_up(have_obj, want_obj)) {
1410 packet_writer_write(writer, "ready\n");
1417 static int process_haves_and_send_acks(struct upload_pack_data *data)
1419 struct oid_array common = OID_ARRAY_INIT;
1422 process_haves(&data->haves, &common, &data->have_obj);
1425 } else if (send_acks(&data->writer, &common,
1426 &data->have_obj, &data->want_obj)) {
1427 packet_writer_delim(&data->writer);
1431 packet_writer_flush(&data->writer);
1435 oid_array_clear(&data->haves);
1436 oid_array_clear(&common);
1440 static void send_wanted_ref_info(struct upload_pack_data *data)
1442 const struct string_list_item *item;
1444 if (!data->wanted_refs.nr)
1447 packet_writer_write(&data->writer, "wanted-refs\n");
1449 for_each_string_list_item(item, &data->wanted_refs) {
1450 packet_writer_write(&data->writer, "%s %s\n",
1451 oid_to_hex(item->util),
1455 packet_writer_delim(&data->writer);
1458 static void send_shallow_info(struct upload_pack_data *data)
1460 /* No shallow info needs to be sent */
1461 if (!data->depth && !data->deepen_rev_list && !data->shallows.nr &&
1462 !is_repository_shallow(the_repository))
1465 packet_writer_write(&data->writer, "shallow-info\n");
1467 if (!send_shallow_list(&data->writer, data->depth,
1468 data->deepen_rev_list,
1469 data->deepen_since, &data->deepen_not,
1470 data->deepen_relative,
1471 &data->shallows, &data->want_obj) &&
1472 is_repository_shallow(the_repository))
1473 deepen(&data->writer, INFINITE_DEPTH, data->deepen_relative,
1474 &data->shallows, &data->want_obj);
1480 FETCH_PROCESS_ARGS = 0,
1486 int upload_pack_v2(struct repository *r, struct argv_array *keys,
1487 struct packet_reader *request)
1489 enum fetch_state state = FETCH_PROCESS_ARGS;
1490 struct upload_pack_data data;
1492 clear_object_flags(ALL_FLAGS);
1494 git_config(upload_pack_config, NULL);
1496 upload_pack_data_init(&data);
1497 data.use_sideband = LARGE_PACKET_MAX;
1499 while (state != FETCH_DONE) {
1501 case FETCH_PROCESS_ARGS:
1502 process_args(request, &data);
1504 if (!data.want_obj.nr) {
1506 * Request didn't contain any 'want' lines,
1507 * guess they didn't want anything.
1510 } else if (data.haves.nr) {
1512 * Request had 'have' lines, so lets ACK them.
1514 state = FETCH_SEND_ACKS;
1517 * Request had 'want's but no 'have's so we can
1518 * immedietly go to construct and send a pack.
1520 state = FETCH_SEND_PACK;
1523 case FETCH_SEND_ACKS:
1524 if (process_haves_and_send_acks(&data))
1525 state = FETCH_SEND_PACK;
1529 case FETCH_SEND_PACK:
1530 send_wanted_ref_info(&data);
1531 send_shallow_info(&data);
1533 packet_writer_write(&data.writer, "packfile\n");
1534 create_pack_file(&data);
1542 upload_pack_data_clear(&data);
1546 int upload_pack_advertise(struct repository *r,
1547 struct strbuf *value)
1550 int allow_filter_value;
1551 int allow_ref_in_want;
1552 int allow_sideband_all_value;
1554 strbuf_addstr(value, "shallow");
1556 if (!repo_config_get_bool(the_repository,
1557 "uploadpack.allowfilter",
1558 &allow_filter_value) &&
1560 strbuf_addstr(value, " filter");
1562 if (!repo_config_get_bool(the_repository,
1563 "uploadpack.allowrefinwant",
1564 &allow_ref_in_want) &&
1566 strbuf_addstr(value, " ref-in-want");
1568 if (git_env_bool("GIT_TEST_SIDEBAND_ALL", 0) ||
1569 (!repo_config_get_bool(the_repository,
1570 "uploadpack.allowsidebandall",
1571 &allow_sideband_all_value) &&
1572 allow_sideband_all_value))
1573 strbuf_addstr(value, " sideband-all");