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 /* Enum for allowed unadvertised object request (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. */
56 * Please annotate, and if possible group together, fields used only
57 * for protocol v0 or only for protocol v2.
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 */
66 struct object_array shallows;
67 struct string_list deepen_not;
68 struct object_array extra_edge_obj;
70 timestamp_t deepen_since;
75 timestamp_t oldest_have;
77 unsigned int timeout; /* v0 only */
81 MULTI_ACK_DETAILED = 2
82 } multi_ack; /* v0 only */
84 /* 0 for no sideband, otherwise DEFAULT_PACKET_MAX or LARGE_PACKET_MAX */
87 struct string_list uri_protocols;
88 enum allow_uor allow_uor;
90 struct list_objects_filter_options filter_options;
91 struct string_list allowed_filters;
93 struct packet_writer writer;
95 const char *pack_objects_hook;
97 unsigned stateless_rpc : 1; /* v0 only */
98 unsigned no_done : 1; /* v0 only */
99 unsigned daemon_mode : 1; /* v0 only */
100 unsigned filter_capability_requested : 1; /* v0 only */
102 unsigned use_thin_pack : 1;
103 unsigned use_ofs_delta : 1;
104 unsigned no_progress : 1;
105 unsigned use_include_tag : 1;
106 unsigned allow_filter : 1;
107 unsigned allow_filter_fallback : 1;
108 unsigned long tree_filter_max_depth;
110 unsigned done : 1; /* v2 only */
111 unsigned allow_ref_in_want : 1; /* v2 only */
112 unsigned allow_sideband_all : 1; /* v2 only */
115 static void upload_pack_data_init(struct upload_pack_data *data)
117 struct string_list symref = STRING_LIST_INIT_DUP;
118 struct string_list wanted_refs = STRING_LIST_INIT_DUP;
119 struct object_array want_obj = OBJECT_ARRAY_INIT;
120 struct object_array have_obj = OBJECT_ARRAY_INIT;
121 struct oid_array haves = OID_ARRAY_INIT;
122 struct object_array shallows = OBJECT_ARRAY_INIT;
123 struct string_list deepen_not = STRING_LIST_INIT_DUP;
124 struct string_list uri_protocols = STRING_LIST_INIT_DUP;
125 struct object_array extra_edge_obj = OBJECT_ARRAY_INIT;
126 struct string_list allowed_filters = STRING_LIST_INIT_DUP;
128 memset(data, 0, sizeof(*data));
129 data->symref = symref;
130 data->wanted_refs = wanted_refs;
131 data->want_obj = want_obj;
132 data->have_obj = have_obj;
134 data->shallows = shallows;
135 data->deepen_not = deepen_not;
136 data->uri_protocols = uri_protocols;
137 data->extra_edge_obj = extra_edge_obj;
138 data->allowed_filters = allowed_filters;
139 data->allow_filter_fallback = 1;
140 data->tree_filter_max_depth = ULONG_MAX;
141 packet_writer_init(&data->writer, 1);
146 static void upload_pack_data_clear(struct upload_pack_data *data)
148 string_list_clear(&data->symref, 1);
149 string_list_clear(&data->wanted_refs, 1);
150 object_array_clear(&data->want_obj);
151 object_array_clear(&data->have_obj);
152 oid_array_clear(&data->haves);
153 object_array_clear(&data->shallows);
154 string_list_clear(&data->deepen_not, 0);
155 object_array_clear(&data->extra_edge_obj);
156 list_objects_filter_release(&data->filter_options);
157 string_list_clear(&data->allowed_filters, 1);
159 free((char *)data->pack_objects_hook);
162 static void reset_timeout(unsigned int timeout)
167 static void send_client_data(int fd, const char *data, ssize_t sz,
171 send_sideband(1, fd, data, sz, use_sideband);
178 /* XXX: are we happy to lose stuff here? */
179 xwrite(fd, data, sz);
182 write_or_die(fd, data, sz);
185 static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
188 if (graft->nr_parent == -1)
189 fprintf(fp, "--shallow %s\n", oid_to_hex(&graft->oid));
193 struct output_state {
196 unsigned packfile_uris_started : 1;
197 unsigned packfile_started : 1;
200 static int relay_pack_data(int pack_objects_out, struct output_state *os,
201 int use_sideband, int write_packfile_line)
204 * We keep the last byte to ourselves
205 * in case we detect broken rev-list, so that we
206 * can leave the stream corrupted. This is
207 * unfortunate -- unpack-objects would happily
208 * accept a valid packdata with trailing garbage,
209 * so appending garbage after we pass all the
210 * pack data is not good enough to signal
211 * breakage to downstream.
215 readsz = xread(pack_objects_out, os->buffer + os->used,
216 sizeof(os->buffer) - os->used);
222 while (!os->packfile_started) {
224 if (os->used >= 4 && !memcmp(os->buffer, "PACK", 4)) {
225 os->packfile_started = 1;
226 if (write_packfile_line) {
227 if (os->packfile_uris_started)
229 packet_write_fmt(1, "\1packfile\n");
233 if ((p = memchr(os->buffer, '\n', os->used))) {
234 if (!os->packfile_uris_started) {
235 os->packfile_uris_started = 1;
236 if (!write_packfile_line)
237 BUG("packfile_uris requires sideband-all");
238 packet_write_fmt(1, "\1packfile-uris\n");
241 packet_write_fmt(1, "\1%s\n", os->buffer);
243 os->used -= p - os->buffer + 1;
244 memmove(os->buffer, p + 1, os->used);
254 send_client_data(1, os->buffer, os->used - 1, use_sideband);
255 os->buffer[0] = os->buffer[os->used - 1];
258 send_client_data(1, os->buffer, os->used, use_sideband);
265 static void create_pack_file(struct upload_pack_data *pack_data,
266 const struct string_list *uri_protocols)
268 struct child_process pack_objects = CHILD_PROCESS_INIT;
269 struct output_state output_state = { { 0 } };
271 char abort_msg[] = "aborting due to possible repository "
272 "corruption on the remote side.";
277 if (!pack_data->pack_objects_hook)
278 pack_objects.git_cmd = 1;
280 argv_array_push(&pack_objects.args, pack_data->pack_objects_hook);
281 argv_array_push(&pack_objects.args, "git");
282 pack_objects.use_shell = 1;
285 if (pack_data->shallow_nr) {
286 argv_array_push(&pack_objects.args, "--shallow-file");
287 argv_array_push(&pack_objects.args, "");
289 argv_array_push(&pack_objects.args, "pack-objects");
290 argv_array_push(&pack_objects.args, "--revs");
291 if (pack_data->use_thin_pack)
292 argv_array_push(&pack_objects.args, "--thin");
294 argv_array_push(&pack_objects.args, "--stdout");
295 if (pack_data->shallow_nr)
296 argv_array_push(&pack_objects.args, "--shallow");
297 if (!pack_data->no_progress)
298 argv_array_push(&pack_objects.args, "--progress");
299 if (pack_data->use_ofs_delta)
300 argv_array_push(&pack_objects.args, "--delta-base-offset");
301 if (pack_data->use_include_tag)
302 argv_array_push(&pack_objects.args, "--include-tag");
303 if (pack_data->filter_options.choice) {
305 expand_list_objects_filter_spec(&pack_data->filter_options);
306 if (pack_objects.use_shell) {
307 struct strbuf buf = STRBUF_INIT;
308 sq_quote_buf(&buf, spec);
309 argv_array_pushf(&pack_objects.args, "--filter=%s", buf.buf);
310 strbuf_release(&buf);
312 argv_array_pushf(&pack_objects.args, "--filter=%s",
317 for (i = 0; i < uri_protocols->nr; i++)
318 argv_array_pushf(&pack_objects.args, "--uri-protocol=%s",
319 uri_protocols->items[i].string);
322 pack_objects.in = -1;
323 pack_objects.out = -1;
324 pack_objects.err = -1;
326 if (start_command(&pack_objects))
327 die("git upload-pack: unable to fork git-pack-objects");
329 pipe_fd = xfdopen(pack_objects.in, "w");
331 if (pack_data->shallow_nr)
332 for_each_commit_graft(write_one_shallow, pipe_fd);
334 for (i = 0; i < pack_data->want_obj.nr; i++)
335 fprintf(pipe_fd, "%s\n",
336 oid_to_hex(&pack_data->want_obj.objects[i].item->oid));
337 fprintf(pipe_fd, "--not\n");
338 for (i = 0; i < pack_data->have_obj.nr; i++)
339 fprintf(pipe_fd, "%s\n",
340 oid_to_hex(&pack_data->have_obj.objects[i].item->oid));
341 for (i = 0; i < pack_data->extra_edge_obj.nr; i++)
342 fprintf(pipe_fd, "%s\n",
343 oid_to_hex(&pack_data->extra_edge_obj.objects[i].item->oid));
344 fprintf(pipe_fd, "\n");
348 /* We read from pack_objects.err to capture stderr output for
349 * progress bar, and pack_objects.out to capture the pack data.
353 struct pollfd pfd[2];
354 int pe, pu, pollsize, polltimeout;
357 reset_timeout(pack_data->timeout);
362 if (0 <= pack_objects.out) {
363 pfd[pollsize].fd = pack_objects.out;
364 pfd[pollsize].events = POLLIN;
368 if (0 <= pack_objects.err) {
369 pfd[pollsize].fd = pack_objects.err;
370 pfd[pollsize].events = POLLIN;
378 polltimeout = pack_data->keepalive < 0
380 : 1000 * pack_data->keepalive;
382 ret = poll(pfd, pollsize, polltimeout);
385 if (errno != EINTR) {
386 error_errno("poll failed, resuming");
391 if (0 <= pe && (pfd[pe].revents & (POLLIN|POLLHUP))) {
392 /* Status ready; we ship that in the side-band
393 * or dump to the standard error.
395 sz = xread(pack_objects.err, progress,
398 send_client_data(2, progress, sz,
399 pack_data->use_sideband);
401 close(pack_objects.err);
402 pack_objects.err = -1;
406 /* give priority to status messages */
409 if (0 <= pu && (pfd[pu].revents & (POLLIN|POLLHUP))) {
410 int result = relay_pack_data(pack_objects.out,
412 pack_data->use_sideband,
416 close(pack_objects.out);
417 pack_objects.out = -1;
418 } else if (result < 0) {
424 * We hit the keepalive timeout without saying anything; send
425 * an empty message on the data sideband just to let the other
426 * side know we're still working on it, but don't have any data
429 * If we don't have a sideband channel, there's no room in the
430 * protocol to say anything, so those clients are just out of
433 if (!ret && pack_data->use_sideband) {
434 static const char buf[] = "0005\1";
435 write_or_die(1, buf, 5);
439 if (finish_command(&pack_objects)) {
440 error("git upload-pack: git-pack-objects died with error.");
445 if (output_state.used > 0) {
446 send_client_data(1, output_state.buffer, output_state.used,
447 pack_data->use_sideband);
448 fprintf(stderr, "flushed.\n");
450 if (pack_data->use_sideband)
455 send_client_data(3, abort_msg, sizeof(abort_msg),
456 pack_data->use_sideband);
457 die("git upload-pack: %s", abort_msg);
460 static int do_got_oid(struct upload_pack_data *data, const struct object_id *oid)
462 int we_knew_they_have = 0;
463 struct object *o = parse_object(the_repository, oid);
466 die("oops (%s)", oid_to_hex(oid));
467 if (o->type == OBJ_COMMIT) {
468 struct commit_list *parents;
469 struct commit *commit = (struct commit *)o;
470 if (o->flags & THEY_HAVE)
471 we_knew_they_have = 1;
473 o->flags |= THEY_HAVE;
474 if (!data->oldest_have || (commit->date < data->oldest_have))
475 data->oldest_have = commit->date;
476 for (parents = commit->parents;
478 parents = parents->next)
479 parents->item->object.flags |= THEY_HAVE;
481 if (!we_knew_they_have) {
482 add_object_array(o, NULL, &data->have_obj);
488 static int got_oid(struct upload_pack_data *data,
489 const char *hex, struct object_id *oid)
491 if (get_oid_hex(hex, oid))
492 die("git upload-pack: expected SHA1 object, got '%s'", hex);
493 if (!has_object_file(oid))
495 return do_got_oid(data, oid);
498 static int ok_to_give_up(struct upload_pack_data *data)
500 uint32_t min_generation = GENERATION_NUMBER_ZERO;
502 if (!data->have_obj.nr)
505 return can_all_from_reach_with_flag(&data->want_obj, THEY_HAVE,
506 COMMON_KNOWN, data->oldest_have,
510 static int get_common_commits(struct upload_pack_data *data,
511 struct packet_reader *reader)
513 struct object_id oid;
514 char last_hex[GIT_MAX_HEXSZ + 1];
519 save_commit_buffer = 0;
524 reset_timeout(data->timeout);
526 if (packet_reader_read(reader) != PACKET_READ_NORMAL) {
527 if (data->multi_ack == MULTI_ACK_DETAILED
530 && ok_to_give_up(data)) {
532 packet_write_fmt(1, "ACK %s ready\n", last_hex);
534 if (data->have_obj.nr == 0 || data->multi_ack)
535 packet_write_fmt(1, "NAK\n");
537 if (data->no_done && sent_ready) {
538 packet_write_fmt(1, "ACK %s\n", last_hex);
541 if (data->stateless_rpc)
547 if (skip_prefix(reader->line, "have ", &arg)) {
548 switch (got_oid(data, arg, &oid)) {
549 case -1: /* they have what we do not */
552 && ok_to_give_up(data)) {
553 const char *hex = oid_to_hex(&oid);
554 if (data->multi_ack == MULTI_ACK_DETAILED) {
556 packet_write_fmt(1, "ACK %s ready\n", hex);
558 packet_write_fmt(1, "ACK %s continue\n", hex);
563 oid_to_hex_r(last_hex, &oid);
564 if (data->multi_ack == MULTI_ACK_DETAILED)
565 packet_write_fmt(1, "ACK %s common\n", last_hex);
566 else if (data->multi_ack)
567 packet_write_fmt(1, "ACK %s continue\n", last_hex);
568 else if (data->have_obj.nr == 1)
569 packet_write_fmt(1, "ACK %s\n", last_hex);
574 if (!strcmp(reader->line, "done")) {
575 if (data->have_obj.nr > 0) {
577 packet_write_fmt(1, "ACK %s\n", last_hex);
580 packet_write_fmt(1, "NAK\n");
583 die("git upload-pack: expected SHA1 list, got '%s'", reader->line);
587 static int is_our_ref(struct object *o, enum allow_uor allow_uor)
589 int allow_hidden_ref = (allow_uor &
590 (ALLOW_TIP_SHA1 | ALLOW_REACHABLE_SHA1));
591 return o->flags & ((allow_hidden_ref ? HIDDEN_REF : 0) | OUR_REF);
595 * on successful case, it's up to the caller to close cmd->out
597 static int do_reachable_revlist(struct child_process *cmd,
598 struct object_array *src,
599 struct object_array *reachable,
600 enum allow_uor allow_uor)
602 static const char *argv[] = {
603 "rev-list", "--stdin", NULL,
606 char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */
608 const unsigned hexsz = the_hash_algo->hexsz;
617 * If the next rev-list --stdin encounters an unknown commit,
618 * it terminates, which will cause SIGPIPE in the write loop
621 sigchain_push(SIGPIPE, SIG_IGN);
623 if (start_command(cmd))
627 namebuf[hexsz + 1] = '\n';
628 for (i = get_max_object_index(); 0 < i; ) {
629 o = get_indexed_object(--i);
632 if (reachable && o->type == OBJ_COMMIT)
633 o->flags &= ~TMP_MARK;
634 if (!is_our_ref(o, allow_uor))
636 memcpy(namebuf + 1, oid_to_hex(&o->oid), hexsz);
637 if (write_in_full(cmd->in, namebuf, hexsz + 2) < 0)
640 namebuf[hexsz] = '\n';
641 for (i = 0; i < src->nr; i++) {
642 o = src->objects[i].item;
643 if (is_our_ref(o, allow_uor)) {
645 add_object_array(o, NULL, reachable);
648 if (reachable && o->type == OBJ_COMMIT)
649 o->flags |= TMP_MARK;
650 memcpy(namebuf, oid_to_hex(&o->oid), hexsz);
651 if (write_in_full(cmd->in, namebuf, hexsz + 1) < 0)
656 sigchain_pop(SIGPIPE);
661 sigchain_pop(SIGPIPE);
670 static int get_reachable_list(struct upload_pack_data *data,
671 struct object_array *reachable)
673 struct child_process cmd = CHILD_PROCESS_INIT;
676 char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */
677 const unsigned hexsz = the_hash_algo->hexsz;
679 if (do_reachable_revlist(&cmd, &data->shallows, reachable,
680 data->allow_uor) < 0)
683 while ((i = read_in_full(cmd.out, namebuf, hexsz + 1)) == hexsz + 1) {
684 struct object_id oid;
687 if (parse_oid_hex(namebuf, &oid, &p) || *p != '\n')
690 o = lookup_object(the_repository, &oid);
691 if (o && o->type == OBJ_COMMIT) {
692 o->flags &= ~TMP_MARK;
695 for (i = get_max_object_index(); 0 < i; i--) {
696 o = get_indexed_object(i - 1);
697 if (o && o->type == OBJ_COMMIT &&
698 (o->flags & TMP_MARK)) {
699 add_object_array(o, NULL, reachable);
700 o->flags &= ~TMP_MARK;
705 if (finish_command(&cmd))
711 static int has_unreachable(struct object_array *src, enum allow_uor allow_uor)
713 struct child_process cmd = CHILD_PROCESS_INIT;
717 if (do_reachable_revlist(&cmd, src, NULL, allow_uor) < 0)
721 * The commits out of the rev-list are not ancestors of
724 i = read_in_full(cmd.out, buf, 1);
731 * rev-list may have died by encountering a bad commit
732 * in the history, in which case we do want to bail out
733 * even when it showed no commit.
735 if (finish_command(&cmd))
738 /* All the non-tip ones are ancestors of what we advertised */
742 sigchain_pop(SIGPIPE);
748 static void check_non_tip(struct upload_pack_data *data)
753 * In the normal in-process case without
754 * uploadpack.allowReachableSHA1InWant,
755 * non-tip requests can never happen.
757 if (!data->stateless_rpc && !(data->allow_uor & ALLOW_REACHABLE_SHA1))
759 if (!has_unreachable(&data->want_obj, data->allow_uor))
760 /* All the non-tip ones are ancestors of what we advertised */
764 /* Pick one of them (we know there at least is one) */
765 for (i = 0; i < data->want_obj.nr; i++) {
766 struct object *o = data->want_obj.objects[i].item;
767 if (!is_our_ref(o, data->allow_uor)) {
768 packet_writer_error(&data->writer,
769 "upload-pack: not our ref %s",
770 oid_to_hex(&o->oid));
771 die("git upload-pack: not our ref %s",
772 oid_to_hex(&o->oid));
777 static void send_shallow(struct upload_pack_data *data,
778 struct commit_list *result)
781 struct object *object = &result->item->object;
782 if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) {
783 packet_writer_write(&data->writer, "shallow %s",
784 oid_to_hex(&object->oid));
785 register_shallow(the_repository, &object->oid);
788 result = result->next;
792 static void send_unshallow(struct upload_pack_data *data)
796 for (i = 0; i < data->shallows.nr; i++) {
797 struct object *object = data->shallows.objects[i].item;
798 if (object->flags & NOT_SHALLOW) {
799 struct commit_list *parents;
800 packet_writer_write(&data->writer, "unshallow %s",
801 oid_to_hex(&object->oid));
802 object->flags &= ~CLIENT_SHALLOW;
804 * We want to _register_ "object" as shallow, but we
805 * also need to traverse object's parents to deepen a
806 * shallow clone. Unregister it for now so we can
807 * parse and add the parents to the want list, then
810 unregister_shallow(&object->oid);
812 parse_commit_or_die((struct commit *)object);
813 parents = ((struct commit *)object)->parents;
815 add_object_array(&parents->item->object,
816 NULL, &data->want_obj);
817 parents = parents->next;
819 add_object_array(object, NULL, &data->extra_edge_obj);
821 /* make sure commit traversal conforms to client */
822 register_shallow(the_repository, &object->oid);
826 static int check_ref(const char *refname_full, const struct object_id *oid,
827 int flag, void *cb_data);
828 static void deepen(struct upload_pack_data *data, int depth)
830 if (depth == INFINITE_DEPTH && !is_repository_shallow(the_repository)) {
833 for (i = 0; i < data->shallows.nr; i++) {
834 struct object *object = data->shallows.objects[i].item;
835 object->flags |= NOT_SHALLOW;
837 } else if (data->deepen_relative) {
838 struct object_array reachable_shallows = OBJECT_ARRAY_INIT;
839 struct commit_list *result;
842 * Checking for reachable shallows requires that our refs be
843 * marked with OUR_REF.
845 head_ref_namespaced(check_ref, NULL);
846 for_each_namespaced_ref(check_ref, NULL);
848 get_reachable_list(data, &reachable_shallows);
849 result = get_shallow_commits(&reachable_shallows,
851 SHALLOW, NOT_SHALLOW);
852 send_shallow(data, result);
853 free_commit_list(result);
854 object_array_clear(&reachable_shallows);
856 struct commit_list *result;
858 result = get_shallow_commits(&data->want_obj, depth,
859 SHALLOW, NOT_SHALLOW);
860 send_shallow(data, result);
861 free_commit_list(result);
864 send_unshallow(data);
867 static void deepen_by_rev_list(struct upload_pack_data *data,
871 struct commit_list *result;
873 disable_commit_graph(the_repository);
874 result = get_shallow_commits_by_rev_list(ac, av, SHALLOW, NOT_SHALLOW);
875 send_shallow(data, result);
876 free_commit_list(result);
877 send_unshallow(data);
880 /* Returns 1 if a shallow list is sent or 0 otherwise */
881 static int send_shallow_list(struct upload_pack_data *data)
885 if (data->depth > 0 && data->deepen_rev_list)
886 die("git upload-pack: deepen and deepen-since (or deepen-not) cannot be used together");
887 if (data->depth > 0) {
888 deepen(data, data->depth);
890 } else if (data->deepen_rev_list) {
891 struct argv_array av = ARGV_ARRAY_INIT;
894 argv_array_push(&av, "rev-list");
895 if (data->deepen_since)
896 argv_array_pushf(&av, "--max-age=%"PRItime, data->deepen_since);
897 if (data->deepen_not.nr) {
898 argv_array_push(&av, "--not");
899 for (i = 0; i < data->deepen_not.nr; i++) {
900 struct string_list_item *s = data->deepen_not.items + i;
901 argv_array_push(&av, s->string);
903 argv_array_push(&av, "--not");
905 for (i = 0; i < data->want_obj.nr; i++) {
906 struct object *o = data->want_obj.objects[i].item;
907 argv_array_push(&av, oid_to_hex(&o->oid));
909 deepen_by_rev_list(data, av.argc, av.argv);
910 argv_array_clear(&av);
913 if (data->shallows.nr > 0) {
915 for (i = 0; i < data->shallows.nr; i++)
916 register_shallow(the_repository,
917 &data->shallows.objects[i].item->oid);
921 data->shallow_nr += data->shallows.nr;
925 static int process_shallow(const char *line, struct object_array *shallows)
928 if (skip_prefix(line, "shallow ", &arg)) {
929 struct object_id oid;
930 struct object *object;
931 if (get_oid_hex(arg, &oid))
932 die("invalid shallow line: %s", line);
933 object = parse_object(the_repository, &oid);
936 if (object->type != OBJ_COMMIT)
937 die("invalid shallow object %s", oid_to_hex(&oid));
938 if (!(object->flags & CLIENT_SHALLOW)) {
939 object->flags |= CLIENT_SHALLOW;
940 add_object_array(object, NULL, shallows);
948 static int process_deepen(const char *line, int *depth)
951 if (skip_prefix(line, "deepen ", &arg)) {
953 *depth = (int)strtol(arg, &end, 0);
954 if (!end || *end || *depth <= 0)
955 die("Invalid deepen: %s", line);
962 static int process_deepen_since(const char *line, timestamp_t *deepen_since, int *deepen_rev_list)
965 if (skip_prefix(line, "deepen-since ", &arg)) {
967 *deepen_since = parse_timestamp(arg, &end, 0);
968 if (!end || *end || !deepen_since ||
969 /* revisions.c's max_age -1 is special */
971 die("Invalid deepen-since: %s", line);
972 *deepen_rev_list = 1;
978 static int process_deepen_not(const char *line, struct string_list *deepen_not, int *deepen_rev_list)
981 if (skip_prefix(line, "deepen-not ", &arg)) {
983 struct object_id oid;
984 if (expand_ref(the_repository, arg, strlen(arg), &oid, &ref) != 1)
985 die("git upload-pack: ambiguous deepen-not: %s", line);
986 string_list_append(deepen_not, ref);
988 *deepen_rev_list = 1;
994 NORETURN __attribute__((format(printf,2,3)))
995 static void send_err_and_die(struct upload_pack_data *data,
996 const char *fmt, ...)
998 struct strbuf buf = STRBUF_INIT;
1002 strbuf_vaddf(&buf, fmt, ap);
1005 packet_writer_error(&data->writer, "%s", buf.buf);
1009 static void check_one_filter(struct upload_pack_data *data,
1010 struct list_objects_filter_options *opts)
1012 const char *key = list_object_filter_config_name(opts->choice);
1013 struct string_list_item *item = string_list_lookup(&data->allowed_filters,
1018 allowed = (intptr_t)item->util;
1020 allowed = data->allow_filter_fallback;
1023 send_err_and_die(data, "filter '%s' not supported", key);
1025 if (opts->choice == LOFC_TREE_DEPTH &&
1026 opts->tree_exclude_depth > data->tree_filter_max_depth)
1027 send_err_and_die(data,
1028 "tree filter allows max depth %lu, but got %lu",
1029 data->tree_filter_max_depth,
1030 opts->tree_exclude_depth);
1033 static void check_filter_recurse(struct upload_pack_data *data,
1034 struct list_objects_filter_options *opts)
1038 check_one_filter(data, opts);
1039 if (opts->choice != LOFC_COMBINE)
1042 for (i = 0; i < opts->sub_nr; i++)
1043 check_filter_recurse(data, &opts->sub[i]);
1046 static void die_if_using_banned_filter(struct upload_pack_data *data)
1048 check_filter_recurse(data, &data->filter_options);
1051 static void receive_needs(struct upload_pack_data *data,
1052 struct packet_reader *reader)
1054 int has_non_tip = 0;
1056 data->shallow_nr = 0;
1059 const char *features;
1060 struct object_id oid_buf;
1063 reset_timeout(data->timeout);
1064 if (packet_reader_read(reader) != PACKET_READ_NORMAL)
1067 if (process_shallow(reader->line, &data->shallows))
1069 if (process_deepen(reader->line, &data->depth))
1071 if (process_deepen_since(reader->line, &data->deepen_since, &data->deepen_rev_list))
1073 if (process_deepen_not(reader->line, &data->deepen_not, &data->deepen_rev_list))
1076 if (skip_prefix(reader->line, "filter ", &arg)) {
1077 if (!data->filter_capability_requested)
1078 die("git upload-pack: filtering capability not negotiated");
1079 list_objects_filter_die_if_populated(&data->filter_options);
1080 parse_list_objects_filter(&data->filter_options, arg);
1081 die_if_using_banned_filter(data);
1085 if (!skip_prefix(reader->line, "want ", &arg) ||
1086 parse_oid_hex(arg, &oid_buf, &features))
1087 die("git upload-pack: protocol error, "
1088 "expected to get object ID, not '%s'", reader->line);
1090 if (parse_feature_request(features, "deepen-relative"))
1091 data->deepen_relative = 1;
1092 if (parse_feature_request(features, "multi_ack_detailed"))
1093 data->multi_ack = MULTI_ACK_DETAILED;
1094 else if (parse_feature_request(features, "multi_ack"))
1095 data->multi_ack = MULTI_ACK;
1096 if (parse_feature_request(features, "no-done"))
1098 if (parse_feature_request(features, "thin-pack"))
1099 data->use_thin_pack = 1;
1100 if (parse_feature_request(features, "ofs-delta"))
1101 data->use_ofs_delta = 1;
1102 if (parse_feature_request(features, "side-band-64k"))
1103 data->use_sideband = LARGE_PACKET_MAX;
1104 else if (parse_feature_request(features, "side-band"))
1105 data->use_sideband = DEFAULT_PACKET_MAX;
1106 if (parse_feature_request(features, "no-progress"))
1107 data->no_progress = 1;
1108 if (parse_feature_request(features, "include-tag"))
1109 data->use_include_tag = 1;
1110 if (data->allow_filter &&
1111 parse_feature_request(features, "filter"))
1112 data->filter_capability_requested = 1;
1114 o = parse_object(the_repository, &oid_buf);
1116 packet_writer_error(&data->writer,
1117 "upload-pack: not our ref %s",
1118 oid_to_hex(&oid_buf));
1119 die("git upload-pack: not our ref %s",
1120 oid_to_hex(&oid_buf));
1122 if (!(o->flags & WANTED)) {
1124 if (!((data->allow_uor & ALLOW_ANY_SHA1) == ALLOW_ANY_SHA1
1125 || is_our_ref(o, data->allow_uor)))
1127 add_object_array(o, NULL, &data->want_obj);
1132 * We have sent all our refs already, and the other end
1133 * should have chosen out of them. When we are operating
1134 * in the stateless RPC mode, however, their choice may
1135 * have been based on the set of older refs advertised
1136 * by another process that handled the initial request.
1139 check_non_tip(data);
1141 if (!data->use_sideband && data->daemon_mode)
1142 data->no_progress = 1;
1144 if (data->depth == 0 && !data->deepen_rev_list && data->shallows.nr == 0)
1147 if (send_shallow_list(data))
1151 /* return non-zero if the ref is hidden, otherwise 0 */
1152 static int mark_our_ref(const char *refname, const char *refname_full,
1153 const struct object_id *oid)
1155 struct object *o = lookup_unknown_object(oid);
1157 if (ref_is_hidden(refname, refname_full)) {
1158 o->flags |= HIDDEN_REF;
1161 o->flags |= OUR_REF;
1165 static int check_ref(const char *refname_full, const struct object_id *oid,
1166 int flag, void *cb_data)
1168 const char *refname = strip_namespace(refname_full);
1170 mark_our_ref(refname, refname_full, oid);
1174 static void format_symref_info(struct strbuf *buf, struct string_list *symref)
1176 struct string_list_item *item;
1180 for_each_string_list_item(item, symref)
1181 strbuf_addf(buf, " symref=%s:%s", item->string, (char *)item->util);
1184 static int send_ref(const char *refname, const struct object_id *oid,
1185 int flag, void *cb_data)
1187 static const char *capabilities = "multi_ack thin-pack side-band"
1188 " side-band-64k ofs-delta shallow deepen-since deepen-not"
1189 " deepen-relative no-progress include-tag multi_ack_detailed";
1190 const char *refname_nons = strip_namespace(refname);
1191 struct object_id peeled;
1192 struct upload_pack_data *data = cb_data;
1194 if (mark_our_ref(refname_nons, refname, oid))
1198 struct strbuf symref_info = STRBUF_INIT;
1200 format_symref_info(&symref_info, &data->symref);
1201 packet_write_fmt(1, "%s %s%c%s%s%s%s%s%s agent=%s\n",
1202 oid_to_hex(oid), refname_nons,
1204 (data->allow_uor & ALLOW_TIP_SHA1) ?
1205 " allow-tip-sha1-in-want" : "",
1206 (data->allow_uor & ALLOW_REACHABLE_SHA1) ?
1207 " allow-reachable-sha1-in-want" : "",
1208 data->stateless_rpc ? " no-done" : "",
1210 data->allow_filter ? " filter" : "",
1211 git_user_agent_sanitized());
1212 strbuf_release(&symref_info);
1214 packet_write_fmt(1, "%s %s\n", oid_to_hex(oid), refname_nons);
1216 capabilities = NULL;
1217 if (!peel_ref(refname, &peeled))
1218 packet_write_fmt(1, "%s %s^{}\n", oid_to_hex(&peeled), refname_nons);
1222 static int find_symref(const char *refname, const struct object_id *oid,
1223 int flag, void *cb_data)
1225 const char *symref_target;
1226 struct string_list_item *item;
1228 if ((flag & REF_ISSYMREF) == 0)
1230 symref_target = resolve_ref_unsafe(refname, 0, NULL, &flag);
1231 if (!symref_target || (flag & REF_ISSYMREF) == 0)
1232 die("'%s' is a symref but it is not?", refname);
1233 item = string_list_append(cb_data, strip_namespace(refname));
1234 item->util = xstrdup(strip_namespace(symref_target));
1238 static int parse_object_filter_config(const char *var, const char *value,
1239 struct upload_pack_data *data)
1241 struct strbuf buf = STRBUF_INIT;
1242 const char *sub, *key;
1245 if (parse_config_key(var, "uploadpackfilter", &sub, &sub_len, &key))
1249 if (!strcmp(key, "allow"))
1250 data->allow_filter_fallback = git_config_bool(var, value);
1254 strbuf_add(&buf, sub, sub_len);
1256 if (!strcmp(key, "allow"))
1257 string_list_insert(&data->allowed_filters, buf.buf)->util =
1258 (void *)(intptr_t)git_config_bool(var, value);
1259 else if (!strcmp(buf.buf, "tree") && !strcmp(key, "maxdepth")) {
1261 strbuf_release(&buf);
1262 return config_error_nonbool(var);
1264 string_list_insert(&data->allowed_filters, buf.buf)->util =
1265 (void *)(intptr_t)1;
1266 data->tree_filter_max_depth = git_config_ulong(var, value);
1269 strbuf_release(&buf);
1273 static int upload_pack_config(const char *var, const char *value, void *cb_data)
1275 struct upload_pack_data *data = cb_data;
1277 if (!strcmp("uploadpack.allowtipsha1inwant", var)) {
1278 if (git_config_bool(var, value))
1279 data->allow_uor |= ALLOW_TIP_SHA1;
1281 data->allow_uor &= ~ALLOW_TIP_SHA1;
1282 } else if (!strcmp("uploadpack.allowreachablesha1inwant", var)) {
1283 if (git_config_bool(var, value))
1284 data->allow_uor |= ALLOW_REACHABLE_SHA1;
1286 data->allow_uor &= ~ALLOW_REACHABLE_SHA1;
1287 } else if (!strcmp("uploadpack.allowanysha1inwant", var)) {
1288 if (git_config_bool(var, value))
1289 data->allow_uor |= ALLOW_ANY_SHA1;
1291 data->allow_uor &= ~ALLOW_ANY_SHA1;
1292 } else if (!strcmp("uploadpack.keepalive", var)) {
1293 data->keepalive = git_config_int(var, value);
1294 if (!data->keepalive)
1295 data->keepalive = -1;
1296 } else if (!strcmp("uploadpack.allowfilter", var)) {
1297 data->allow_filter = git_config_bool(var, value);
1298 } else if (!strcmp("uploadpack.allowrefinwant", var)) {
1299 data->allow_ref_in_want = git_config_bool(var, value);
1300 } else if (!strcmp("uploadpack.allowsidebandall", var)) {
1301 data->allow_sideband_all = git_config_bool(var, value);
1302 } else if (!strcmp("core.precomposeunicode", var)) {
1303 precomposed_unicode = git_config_bool(var, value);
1306 if (current_config_scope() != CONFIG_SCOPE_LOCAL &&
1307 current_config_scope() != CONFIG_SCOPE_WORKTREE) {
1308 if (!strcmp("uploadpack.packobjectshook", var))
1309 return git_config_string(&data->pack_objects_hook, var, value);
1312 parse_object_filter_config(var, value, data);
1314 return parse_hide_refs_config(var, value, "uploadpack");
1317 void upload_pack(struct upload_pack_options *options)
1319 struct packet_reader reader;
1320 struct upload_pack_data data;
1322 upload_pack_data_init(&data);
1324 git_config(upload_pack_config, &data);
1326 data.stateless_rpc = options->stateless_rpc;
1327 data.daemon_mode = options->daemon_mode;
1328 data.timeout = options->timeout;
1330 head_ref_namespaced(find_symref, &data.symref);
1332 if (options->advertise_refs || !data.stateless_rpc) {
1333 reset_timeout(data.timeout);
1334 head_ref_namespaced(send_ref, &data);
1335 for_each_namespaced_ref(send_ref, &data);
1336 advertise_shallow_grafts(1);
1339 head_ref_namespaced(check_ref, NULL);
1340 for_each_namespaced_ref(check_ref, NULL);
1343 if (!options->advertise_refs) {
1344 packet_reader_init(&reader, 0, NULL, 0,
1345 PACKET_READ_CHOMP_NEWLINE |
1346 PACKET_READ_DIE_ON_ERR_PACKET);
1348 receive_needs(&data, &reader);
1349 if (data.want_obj.nr) {
1350 get_common_commits(&data, &reader);
1351 create_pack_file(&data, NULL);
1355 upload_pack_data_clear(&data);
1358 static int parse_want(struct packet_writer *writer, const char *line,
1359 struct object_array *want_obj)
1362 if (skip_prefix(line, "want ", &arg)) {
1363 struct object_id oid;
1366 if (get_oid_hex(arg, &oid))
1367 die("git upload-pack: protocol error, "
1368 "expected to get oid, not '%s'", line);
1370 o = parse_object(the_repository, &oid);
1372 packet_writer_error(writer,
1373 "upload-pack: not our ref %s",
1375 die("git upload-pack: not our ref %s",
1379 if (!(o->flags & WANTED)) {
1381 add_object_array(o, NULL, want_obj);
1390 static int parse_want_ref(struct packet_writer *writer, const char *line,
1391 struct string_list *wanted_refs,
1392 struct object_array *want_obj)
1395 if (skip_prefix(line, "want-ref ", &arg)) {
1396 struct object_id oid;
1397 struct string_list_item *item;
1400 if (read_ref(arg, &oid)) {
1401 packet_writer_error(writer, "unknown ref %s", arg);
1402 die("unknown ref %s", arg);
1405 item = string_list_append(wanted_refs, arg);
1406 item->util = oiddup(&oid);
1408 o = parse_object_or_die(&oid, arg);
1409 if (!(o->flags & WANTED)) {
1411 add_object_array(o, NULL, want_obj);
1420 static int parse_have(const char *line, struct oid_array *haves)
1423 if (skip_prefix(line, "have ", &arg)) {
1424 struct object_id oid;
1426 if (get_oid_hex(arg, &oid))
1427 die("git upload-pack: expected SHA1 object, got '%s'", arg);
1428 oid_array_append(haves, &oid);
1435 static void process_args(struct packet_reader *request,
1436 struct upload_pack_data *data)
1438 while (packet_reader_read(request) == PACKET_READ_NORMAL) {
1439 const char *arg = request->line;
1443 if (parse_want(&data->writer, arg, &data->want_obj))
1445 if (data->allow_ref_in_want &&
1446 parse_want_ref(&data->writer, arg, &data->wanted_refs,
1449 /* process have line */
1450 if (parse_have(arg, &data->haves))
1453 /* process args like thin-pack */
1454 if (!strcmp(arg, "thin-pack")) {
1455 data->use_thin_pack = 1;
1458 if (!strcmp(arg, "ofs-delta")) {
1459 data->use_ofs_delta = 1;
1462 if (!strcmp(arg, "no-progress")) {
1463 data->no_progress = 1;
1466 if (!strcmp(arg, "include-tag")) {
1467 data->use_include_tag = 1;
1470 if (!strcmp(arg, "done")) {
1475 /* Shallow related arguments */
1476 if (process_shallow(arg, &data->shallows))
1478 if (process_deepen(arg, &data->depth))
1480 if (process_deepen_since(arg, &data->deepen_since,
1481 &data->deepen_rev_list))
1483 if (process_deepen_not(arg, &data->deepen_not,
1484 &data->deepen_rev_list))
1486 if (!strcmp(arg, "deepen-relative")) {
1487 data->deepen_relative = 1;
1491 if (data->allow_filter && skip_prefix(arg, "filter ", &p)) {
1492 list_objects_filter_die_if_populated(&data->filter_options);
1493 parse_list_objects_filter(&data->filter_options, p);
1494 die_if_using_banned_filter(data);
1498 if ((git_env_bool("GIT_TEST_SIDEBAND_ALL", 0) ||
1499 data->allow_sideband_all) &&
1500 !strcmp(arg, "sideband-all")) {
1501 data->writer.use_sideband = 1;
1505 if (skip_prefix(arg, "packfile-uris ", &p)) {
1506 string_list_split(&data->uri_protocols, p, ',', -1);
1510 /* ignore unknown lines maybe? */
1511 die("unexpected line: '%s'", arg);
1514 if (data->uri_protocols.nr && !data->writer.use_sideband)
1515 string_list_clear(&data->uri_protocols, 0);
1517 if (request->status != PACKET_READ_FLUSH)
1518 die(_("expected flush after fetch arguments"));
1521 static int process_haves(struct upload_pack_data *data, struct oid_array *common)
1526 for (i = 0; i < data->haves.nr; i++) {
1527 const struct object_id *oid = &data->haves.oid[i];
1529 if (!has_object_file(oid))
1532 oid_array_append(common, oid);
1534 do_got_oid(data, oid);
1540 static int send_acks(struct upload_pack_data *data, struct oid_array *acks)
1544 packet_writer_write(&data->writer, "acknowledgments\n");
1548 packet_writer_write(&data->writer, "NAK\n");
1550 for (i = 0; i < acks->nr; i++) {
1551 packet_writer_write(&data->writer, "ACK %s\n",
1552 oid_to_hex(&acks->oid[i]));
1555 if (ok_to_give_up(data)) {
1557 packet_writer_write(&data->writer, "ready\n");
1564 static int process_haves_and_send_acks(struct upload_pack_data *data)
1566 struct oid_array common = OID_ARRAY_INIT;
1569 process_haves(data, &common);
1572 } else if (send_acks(data, &common)) {
1573 packet_writer_delim(&data->writer);
1577 packet_writer_flush(&data->writer);
1581 oid_array_clear(&data->haves);
1582 oid_array_clear(&common);
1586 static void send_wanted_ref_info(struct upload_pack_data *data)
1588 const struct string_list_item *item;
1590 if (!data->wanted_refs.nr)
1593 packet_writer_write(&data->writer, "wanted-refs\n");
1595 for_each_string_list_item(item, &data->wanted_refs) {
1596 packet_writer_write(&data->writer, "%s %s\n",
1597 oid_to_hex(item->util),
1601 packet_writer_delim(&data->writer);
1604 static void send_shallow_info(struct upload_pack_data *data)
1606 /* No shallow info needs to be sent */
1607 if (!data->depth && !data->deepen_rev_list && !data->shallows.nr &&
1608 !is_repository_shallow(the_repository))
1611 packet_writer_write(&data->writer, "shallow-info\n");
1613 if (!send_shallow_list(data) &&
1614 is_repository_shallow(the_repository))
1615 deepen(data, INFINITE_DEPTH);
1621 FETCH_PROCESS_ARGS = 0,
1627 int upload_pack_v2(struct repository *r, struct argv_array *keys,
1628 struct packet_reader *request)
1630 enum fetch_state state = FETCH_PROCESS_ARGS;
1631 struct upload_pack_data data;
1633 clear_object_flags(ALL_FLAGS);
1635 upload_pack_data_init(&data);
1636 data.use_sideband = LARGE_PACKET_MAX;
1638 git_config(upload_pack_config, &data);
1640 while (state != FETCH_DONE) {
1642 case FETCH_PROCESS_ARGS:
1643 process_args(request, &data);
1645 if (!data.want_obj.nr) {
1647 * Request didn't contain any 'want' lines,
1648 * guess they didn't want anything.
1651 } else if (data.haves.nr) {
1653 * Request had 'have' lines, so lets ACK them.
1655 state = FETCH_SEND_ACKS;
1658 * Request had 'want's but no 'have's so we can
1659 * immedietly go to construct and send a pack.
1661 state = FETCH_SEND_PACK;
1664 case FETCH_SEND_ACKS:
1665 if (process_haves_and_send_acks(&data))
1666 state = FETCH_SEND_PACK;
1670 case FETCH_SEND_PACK:
1671 send_wanted_ref_info(&data);
1672 send_shallow_info(&data);
1674 if (data.uri_protocols.nr) {
1675 create_pack_file(&data, &data.uri_protocols);
1677 packet_writer_write(&data.writer, "packfile\n");
1678 create_pack_file(&data, NULL);
1687 upload_pack_data_clear(&data);
1691 int upload_pack_advertise(struct repository *r,
1692 struct strbuf *value)
1695 int allow_filter_value;
1696 int allow_ref_in_want;
1697 int allow_sideband_all_value;
1700 strbuf_addstr(value, "shallow");
1702 if (!repo_config_get_bool(the_repository,
1703 "uploadpack.allowfilter",
1704 &allow_filter_value) &&
1706 strbuf_addstr(value, " filter");
1708 if (!repo_config_get_bool(the_repository,
1709 "uploadpack.allowrefinwant",
1710 &allow_ref_in_want) &&
1712 strbuf_addstr(value, " ref-in-want");
1714 if (git_env_bool("GIT_TEST_SIDEBAND_ALL", 0) ||
1715 (!repo_config_get_bool(the_repository,
1716 "uploadpack.allowsidebandall",
1717 &allow_sideband_all_value) &&
1718 allow_sideband_all_value))
1719 strbuf_addstr(value, " sideband-all");
1721 if (!repo_config_get_string(the_repository,
1722 "uploadpack.blobpackfileuri",
1725 strbuf_addstr(value, " packfile-uris");