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"
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 */
113 unsigned advertise_sid : 1;
116 static void upload_pack_data_init(struct upload_pack_data *data)
118 struct string_list symref = STRING_LIST_INIT_DUP;
119 struct string_list wanted_refs = STRING_LIST_INIT_DUP;
120 struct object_array want_obj = OBJECT_ARRAY_INIT;
121 struct object_array have_obj = OBJECT_ARRAY_INIT;
122 struct oid_array haves = OID_ARRAY_INIT;
123 struct object_array shallows = OBJECT_ARRAY_INIT;
124 struct string_list deepen_not = STRING_LIST_INIT_DUP;
125 struct string_list uri_protocols = STRING_LIST_INIT_DUP;
126 struct object_array extra_edge_obj = OBJECT_ARRAY_INIT;
127 struct string_list allowed_filters = STRING_LIST_INIT_DUP;
129 memset(data, 0, sizeof(*data));
130 data->symref = symref;
131 data->wanted_refs = wanted_refs;
132 data->want_obj = want_obj;
133 data->have_obj = have_obj;
135 data->shallows = shallows;
136 data->deepen_not = deepen_not;
137 data->uri_protocols = uri_protocols;
138 data->extra_edge_obj = extra_edge_obj;
139 data->allowed_filters = allowed_filters;
140 data->allow_filter_fallback = 1;
141 data->tree_filter_max_depth = ULONG_MAX;
142 packet_writer_init(&data->writer, 1);
145 data->advertise_sid = 0;
148 static void upload_pack_data_clear(struct upload_pack_data *data)
150 string_list_clear(&data->symref, 1);
151 string_list_clear(&data->wanted_refs, 1);
152 object_array_clear(&data->want_obj);
153 object_array_clear(&data->have_obj);
154 oid_array_clear(&data->haves);
155 object_array_clear(&data->shallows);
156 string_list_clear(&data->deepen_not, 0);
157 object_array_clear(&data->extra_edge_obj);
158 list_objects_filter_release(&data->filter_options);
159 string_list_clear(&data->allowed_filters, 0);
161 free((char *)data->pack_objects_hook);
164 static void reset_timeout(unsigned int timeout)
169 static void send_client_data(int fd, const char *data, ssize_t sz,
173 send_sideband(1, fd, data, sz, use_sideband);
180 /* XXX: are we happy to lose stuff here? */
181 xwrite(fd, data, sz);
184 write_or_die(fd, data, sz);
187 static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
190 if (graft->nr_parent == -1)
191 fprintf(fp, "--shallow %s\n", oid_to_hex(&graft->oid));
195 struct output_state {
198 unsigned packfile_uris_started : 1;
199 unsigned packfile_started : 1;
202 static int relay_pack_data(int pack_objects_out, struct output_state *os,
203 int use_sideband, int write_packfile_line)
206 * We keep the last byte to ourselves
207 * in case we detect broken rev-list, so that we
208 * can leave the stream corrupted. This is
209 * unfortunate -- unpack-objects would happily
210 * accept a valid packdata with trailing garbage,
211 * so appending garbage after we pass all the
212 * pack data is not good enough to signal
213 * breakage to downstream.
217 readsz = xread(pack_objects_out, os->buffer + os->used,
218 sizeof(os->buffer) - os->used);
224 while (!os->packfile_started) {
226 if (os->used >= 4 && !memcmp(os->buffer, "PACK", 4)) {
227 os->packfile_started = 1;
228 if (write_packfile_line) {
229 if (os->packfile_uris_started)
231 packet_write_fmt(1, "\1packfile\n");
235 if ((p = memchr(os->buffer, '\n', os->used))) {
236 if (!os->packfile_uris_started) {
237 os->packfile_uris_started = 1;
238 if (!write_packfile_line)
239 BUG("packfile_uris requires sideband-all");
240 packet_write_fmt(1, "\1packfile-uris\n");
243 packet_write_fmt(1, "\1%s\n", os->buffer);
245 os->used -= p - os->buffer + 1;
246 memmove(os->buffer, p + 1, os->used);
256 send_client_data(1, os->buffer, os->used - 1, use_sideband);
257 os->buffer[0] = os->buffer[os->used - 1];
260 send_client_data(1, os->buffer, os->used, use_sideband);
267 static void create_pack_file(struct upload_pack_data *pack_data,
268 const struct string_list *uri_protocols)
270 struct child_process pack_objects = CHILD_PROCESS_INIT;
271 struct output_state output_state = { { 0 } };
273 char abort_msg[] = "aborting due to possible repository "
274 "corruption on the remote side.";
279 if (!pack_data->pack_objects_hook)
280 pack_objects.git_cmd = 1;
282 strvec_push(&pack_objects.args, pack_data->pack_objects_hook);
283 strvec_push(&pack_objects.args, "git");
284 pack_objects.use_shell = 1;
287 if (pack_data->shallow_nr) {
288 strvec_push(&pack_objects.args, "--shallow-file");
289 strvec_push(&pack_objects.args, "");
291 strvec_push(&pack_objects.args, "pack-objects");
292 strvec_push(&pack_objects.args, "--revs");
293 if (pack_data->use_thin_pack)
294 strvec_push(&pack_objects.args, "--thin");
296 strvec_push(&pack_objects.args, "--stdout");
297 if (pack_data->shallow_nr)
298 strvec_push(&pack_objects.args, "--shallow");
299 if (!pack_data->no_progress)
300 strvec_push(&pack_objects.args, "--progress");
301 if (pack_data->use_ofs_delta)
302 strvec_push(&pack_objects.args, "--delta-base-offset");
303 if (pack_data->use_include_tag)
304 strvec_push(&pack_objects.args, "--include-tag");
305 if (pack_data->filter_options.choice) {
307 expand_list_objects_filter_spec(&pack_data->filter_options);
308 strvec_pushf(&pack_objects.args, "--filter=%s", spec);
311 for (i = 0; i < uri_protocols->nr; i++)
312 strvec_pushf(&pack_objects.args, "--uri-protocol=%s",
313 uri_protocols->items[i].string);
316 pack_objects.in = -1;
317 pack_objects.out = -1;
318 pack_objects.err = -1;
319 pack_objects.clean_on_exit = 1;
321 if (start_command(&pack_objects))
322 die("git upload-pack: unable to fork git-pack-objects");
324 pipe_fd = xfdopen(pack_objects.in, "w");
326 if (pack_data->shallow_nr)
327 for_each_commit_graft(write_one_shallow, pipe_fd);
329 for (i = 0; i < pack_data->want_obj.nr; i++)
330 fprintf(pipe_fd, "%s\n",
331 oid_to_hex(&pack_data->want_obj.objects[i].item->oid));
332 fprintf(pipe_fd, "--not\n");
333 for (i = 0; i < pack_data->have_obj.nr; i++)
334 fprintf(pipe_fd, "%s\n",
335 oid_to_hex(&pack_data->have_obj.objects[i].item->oid));
336 for (i = 0; i < pack_data->extra_edge_obj.nr; i++)
337 fprintf(pipe_fd, "%s\n",
338 oid_to_hex(&pack_data->extra_edge_obj.objects[i].item->oid));
339 fprintf(pipe_fd, "\n");
343 /* We read from pack_objects.err to capture stderr output for
344 * progress bar, and pack_objects.out to capture the pack data.
348 struct pollfd pfd[2];
349 int pe, pu, pollsize, polltimeout;
352 reset_timeout(pack_data->timeout);
357 if (0 <= pack_objects.out) {
358 pfd[pollsize].fd = pack_objects.out;
359 pfd[pollsize].events = POLLIN;
363 if (0 <= pack_objects.err) {
364 pfd[pollsize].fd = pack_objects.err;
365 pfd[pollsize].events = POLLIN;
373 polltimeout = pack_data->keepalive < 0
375 : 1000 * pack_data->keepalive;
377 ret = poll(pfd, pollsize, polltimeout);
380 if (errno != EINTR) {
381 error_errno("poll failed, resuming");
386 if (0 <= pe && (pfd[pe].revents & (POLLIN|POLLHUP))) {
387 /* Status ready; we ship that in the side-band
388 * or dump to the standard error.
390 sz = xread(pack_objects.err, progress,
393 send_client_data(2, progress, sz,
394 pack_data->use_sideband);
396 close(pack_objects.err);
397 pack_objects.err = -1;
401 /* give priority to status messages */
404 if (0 <= pu && (pfd[pu].revents & (POLLIN|POLLHUP))) {
405 int result = relay_pack_data(pack_objects.out,
407 pack_data->use_sideband,
411 close(pack_objects.out);
412 pack_objects.out = -1;
413 } else if (result < 0) {
419 * We hit the keepalive timeout without saying anything; send
420 * an empty message on the data sideband just to let the other
421 * side know we're still working on it, but don't have any data
424 * If we don't have a sideband channel, there's no room in the
425 * protocol to say anything, so those clients are just out of
428 if (!ret && pack_data->use_sideband) {
429 static const char buf[] = "0005\1";
430 write_or_die(1, buf, 5);
434 if (finish_command(&pack_objects)) {
435 error("git upload-pack: git-pack-objects died with error.");
440 if (output_state.used > 0) {
441 send_client_data(1, output_state.buffer, output_state.used,
442 pack_data->use_sideband);
443 fprintf(stderr, "flushed.\n");
445 if (pack_data->use_sideband)
450 send_client_data(3, abort_msg, sizeof(abort_msg),
451 pack_data->use_sideband);
452 die("git upload-pack: %s", abort_msg);
455 static int do_got_oid(struct upload_pack_data *data, const struct object_id *oid)
457 int we_knew_they_have = 0;
458 struct object *o = parse_object(the_repository, oid);
461 die("oops (%s)", oid_to_hex(oid));
462 if (o->type == OBJ_COMMIT) {
463 struct commit_list *parents;
464 struct commit *commit = (struct commit *)o;
465 if (o->flags & THEY_HAVE)
466 we_knew_they_have = 1;
468 o->flags |= THEY_HAVE;
469 if (!data->oldest_have || (commit->date < data->oldest_have))
470 data->oldest_have = commit->date;
471 for (parents = commit->parents;
473 parents = parents->next)
474 parents->item->object.flags |= THEY_HAVE;
476 if (!we_knew_they_have) {
477 add_object_array(o, NULL, &data->have_obj);
483 static int got_oid(struct upload_pack_data *data,
484 const char *hex, struct object_id *oid)
486 if (get_oid_hex(hex, oid))
487 die("git upload-pack: expected SHA1 object, got '%s'", hex);
488 if (!has_object_file_with_flags(oid,
489 OBJECT_INFO_QUICK | OBJECT_INFO_SKIP_FETCH_OBJECT))
491 return do_got_oid(data, oid);
494 static int ok_to_give_up(struct upload_pack_data *data)
496 timestamp_t min_generation = GENERATION_NUMBER_ZERO;
498 if (!data->have_obj.nr)
501 return can_all_from_reach_with_flag(&data->want_obj, THEY_HAVE,
502 COMMON_KNOWN, data->oldest_have,
506 static int get_common_commits(struct upload_pack_data *data,
507 struct packet_reader *reader)
509 struct object_id oid;
510 char last_hex[GIT_MAX_HEXSZ + 1];
515 save_commit_buffer = 0;
520 reset_timeout(data->timeout);
522 if (packet_reader_read(reader) != PACKET_READ_NORMAL) {
523 if (data->multi_ack == MULTI_ACK_DETAILED
526 && ok_to_give_up(data)) {
528 packet_write_fmt(1, "ACK %s ready\n", last_hex);
530 if (data->have_obj.nr == 0 || data->multi_ack)
531 packet_write_fmt(1, "NAK\n");
533 if (data->no_done && sent_ready) {
534 packet_write_fmt(1, "ACK %s\n", last_hex);
537 if (data->stateless_rpc)
543 if (skip_prefix(reader->line, "have ", &arg)) {
544 switch (got_oid(data, arg, &oid)) {
545 case -1: /* they have what we do not */
548 && ok_to_give_up(data)) {
549 const char *hex = oid_to_hex(&oid);
550 if (data->multi_ack == MULTI_ACK_DETAILED) {
552 packet_write_fmt(1, "ACK %s ready\n", hex);
554 packet_write_fmt(1, "ACK %s continue\n", hex);
559 oid_to_hex_r(last_hex, &oid);
560 if (data->multi_ack == MULTI_ACK_DETAILED)
561 packet_write_fmt(1, "ACK %s common\n", last_hex);
562 else if (data->multi_ack)
563 packet_write_fmt(1, "ACK %s continue\n", last_hex);
564 else if (data->have_obj.nr == 1)
565 packet_write_fmt(1, "ACK %s\n", last_hex);
570 if (!strcmp(reader->line, "done")) {
571 if (data->have_obj.nr > 0) {
573 packet_write_fmt(1, "ACK %s\n", last_hex);
576 packet_write_fmt(1, "NAK\n");
579 die("git upload-pack: expected SHA1 list, got '%s'", reader->line);
583 static int is_our_ref(struct object *o, enum allow_uor allow_uor)
585 int allow_hidden_ref = (allow_uor &
586 (ALLOW_TIP_SHA1 | ALLOW_REACHABLE_SHA1));
587 return o->flags & ((allow_hidden_ref ? HIDDEN_REF : 0) | OUR_REF);
591 * on successful case, it's up to the caller to close cmd->out
593 static int do_reachable_revlist(struct child_process *cmd,
594 struct object_array *src,
595 struct object_array *reachable,
596 enum allow_uor allow_uor)
598 static const char *argv[] = {
599 "rev-list", "--stdin", NULL,
612 * If the next rev-list --stdin encounters an unknown commit,
613 * it terminates, which will cause SIGPIPE in the write loop
616 sigchain_push(SIGPIPE, SIG_IGN);
618 if (start_command(cmd))
621 cmd_in = xfdopen(cmd->in, "w");
623 for (i = get_max_object_index(); 0 < i; ) {
624 o = get_indexed_object(--i);
627 if (reachable && o->type == OBJ_COMMIT)
628 o->flags &= ~TMP_MARK;
629 if (!is_our_ref(o, allow_uor))
631 if (fprintf(cmd_in, "^%s\n", oid_to_hex(&o->oid)) < 0)
634 for (i = 0; i < src->nr; i++) {
635 o = src->objects[i].item;
636 if (is_our_ref(o, allow_uor)) {
638 add_object_array(o, NULL, reachable);
641 if (reachable && o->type == OBJ_COMMIT)
642 o->flags |= TMP_MARK;
643 if (fprintf(cmd_in, "%s\n", oid_to_hex(&o->oid)) < 0)
646 if (ferror(cmd_in) || fflush(cmd_in))
650 sigchain_pop(SIGPIPE);
655 sigchain_pop(SIGPIPE);
664 static int get_reachable_list(struct upload_pack_data *data,
665 struct object_array *reachable)
667 struct child_process cmd = CHILD_PROCESS_INIT;
670 char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */
671 const unsigned hexsz = the_hash_algo->hexsz;
673 if (do_reachable_revlist(&cmd, &data->shallows, reachable,
674 data->allow_uor) < 0)
677 while ((i = read_in_full(cmd.out, namebuf, hexsz + 1)) == hexsz + 1) {
678 struct object_id oid;
681 if (parse_oid_hex(namebuf, &oid, &p) || *p != '\n')
684 o = lookup_object(the_repository, &oid);
685 if (o && o->type == OBJ_COMMIT) {
686 o->flags &= ~TMP_MARK;
689 for (i = get_max_object_index(); 0 < i; i--) {
690 o = get_indexed_object(i - 1);
691 if (o && o->type == OBJ_COMMIT &&
692 (o->flags & TMP_MARK)) {
693 add_object_array(o, NULL, reachable);
694 o->flags &= ~TMP_MARK;
699 if (finish_command(&cmd))
705 static int has_unreachable(struct object_array *src, enum allow_uor allow_uor)
707 struct child_process cmd = CHILD_PROCESS_INIT;
711 if (do_reachable_revlist(&cmd, src, NULL, allow_uor) < 0)
715 * The commits out of the rev-list are not ancestors of
718 i = read_in_full(cmd.out, buf, 1);
725 * rev-list may have died by encountering a bad commit
726 * in the history, in which case we do want to bail out
727 * even when it showed no commit.
729 if (finish_command(&cmd))
732 /* All the non-tip ones are ancestors of what we advertised */
741 static void check_non_tip(struct upload_pack_data *data)
746 * In the normal in-process case without
747 * uploadpack.allowReachableSHA1InWant,
748 * non-tip requests can never happen.
750 if (!data->stateless_rpc && !(data->allow_uor & ALLOW_REACHABLE_SHA1))
752 if (!has_unreachable(&data->want_obj, data->allow_uor))
753 /* All the non-tip ones are ancestors of what we advertised */
757 /* Pick one of them (we know there at least is one) */
758 for (i = 0; i < data->want_obj.nr; i++) {
759 struct object *o = data->want_obj.objects[i].item;
760 if (!is_our_ref(o, data->allow_uor)) {
761 packet_writer_error(&data->writer,
762 "upload-pack: not our ref %s",
763 oid_to_hex(&o->oid));
764 die("git upload-pack: not our ref %s",
765 oid_to_hex(&o->oid));
770 static void send_shallow(struct upload_pack_data *data,
771 struct commit_list *result)
774 struct object *object = &result->item->object;
775 if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) {
776 packet_writer_write(&data->writer, "shallow %s",
777 oid_to_hex(&object->oid));
778 register_shallow(the_repository, &object->oid);
781 result = result->next;
785 static void send_unshallow(struct upload_pack_data *data)
789 for (i = 0; i < data->shallows.nr; i++) {
790 struct object *object = data->shallows.objects[i].item;
791 if (object->flags & NOT_SHALLOW) {
792 struct commit_list *parents;
793 packet_writer_write(&data->writer, "unshallow %s",
794 oid_to_hex(&object->oid));
795 object->flags &= ~CLIENT_SHALLOW;
797 * We want to _register_ "object" as shallow, but we
798 * also need to traverse object's parents to deepen a
799 * shallow clone. Unregister it for now so we can
800 * parse and add the parents to the want list, then
803 unregister_shallow(&object->oid);
805 parse_commit_or_die((struct commit *)object);
806 parents = ((struct commit *)object)->parents;
808 add_object_array(&parents->item->object,
809 NULL, &data->want_obj);
810 parents = parents->next;
812 add_object_array(object, NULL, &data->extra_edge_obj);
814 /* make sure commit traversal conforms to client */
815 register_shallow(the_repository, &object->oid);
819 static int check_ref(const char *refname_full, const struct object_id *oid,
820 int flag, void *cb_data);
821 static void deepen(struct upload_pack_data *data, int depth)
823 if (depth == INFINITE_DEPTH && !is_repository_shallow(the_repository)) {
826 for (i = 0; i < data->shallows.nr; i++) {
827 struct object *object = data->shallows.objects[i].item;
828 object->flags |= NOT_SHALLOW;
830 } else if (data->deepen_relative) {
831 struct object_array reachable_shallows = OBJECT_ARRAY_INIT;
832 struct commit_list *result;
835 * Checking for reachable shallows requires that our refs be
836 * marked with OUR_REF.
838 head_ref_namespaced(check_ref, NULL);
839 for_each_namespaced_ref(check_ref, NULL);
841 get_reachable_list(data, &reachable_shallows);
842 result = get_shallow_commits(&reachable_shallows,
844 SHALLOW, NOT_SHALLOW);
845 send_shallow(data, result);
846 free_commit_list(result);
847 object_array_clear(&reachable_shallows);
849 struct commit_list *result;
851 result = get_shallow_commits(&data->want_obj, depth,
852 SHALLOW, NOT_SHALLOW);
853 send_shallow(data, result);
854 free_commit_list(result);
857 send_unshallow(data);
860 static void deepen_by_rev_list(struct upload_pack_data *data,
864 struct commit_list *result;
866 disable_commit_graph(the_repository);
867 result = get_shallow_commits_by_rev_list(ac, av, SHALLOW, NOT_SHALLOW);
868 send_shallow(data, result);
869 free_commit_list(result);
870 send_unshallow(data);
873 /* Returns 1 if a shallow list is sent or 0 otherwise */
874 static int send_shallow_list(struct upload_pack_data *data)
878 if (data->depth > 0 && data->deepen_rev_list)
879 die("git upload-pack: deepen and deepen-since (or deepen-not) cannot be used together");
880 if (data->depth > 0) {
881 deepen(data, data->depth);
883 } else if (data->deepen_rev_list) {
884 struct strvec av = STRVEC_INIT;
887 strvec_push(&av, "rev-list");
888 if (data->deepen_since)
889 strvec_pushf(&av, "--max-age=%"PRItime, data->deepen_since);
890 if (data->deepen_not.nr) {
891 strvec_push(&av, "--not");
892 for (i = 0; i < data->deepen_not.nr; i++) {
893 struct string_list_item *s = data->deepen_not.items + i;
894 strvec_push(&av, s->string);
896 strvec_push(&av, "--not");
898 for (i = 0; i < data->want_obj.nr; i++) {
899 struct object *o = data->want_obj.objects[i].item;
900 strvec_push(&av, oid_to_hex(&o->oid));
902 deepen_by_rev_list(data, av.nr, av.v);
906 if (data->shallows.nr > 0) {
908 for (i = 0; i < data->shallows.nr; i++)
909 register_shallow(the_repository,
910 &data->shallows.objects[i].item->oid);
914 data->shallow_nr += data->shallows.nr;
918 static int process_shallow(const char *line, struct object_array *shallows)
921 if (skip_prefix(line, "shallow ", &arg)) {
922 struct object_id oid;
923 struct object *object;
924 if (get_oid_hex(arg, &oid))
925 die("invalid shallow line: %s", line);
926 object = parse_object(the_repository, &oid);
929 if (object->type != OBJ_COMMIT)
930 die("invalid shallow object %s", oid_to_hex(&oid));
931 if (!(object->flags & CLIENT_SHALLOW)) {
932 object->flags |= CLIENT_SHALLOW;
933 add_object_array(object, NULL, shallows);
941 static int process_deepen(const char *line, int *depth)
944 if (skip_prefix(line, "deepen ", &arg)) {
946 *depth = (int)strtol(arg, &end, 0);
947 if (!end || *end || *depth <= 0)
948 die("Invalid deepen: %s", line);
955 static int process_deepen_since(const char *line, timestamp_t *deepen_since, int *deepen_rev_list)
958 if (skip_prefix(line, "deepen-since ", &arg)) {
960 *deepen_since = parse_timestamp(arg, &end, 0);
961 if (!end || *end || !deepen_since ||
962 /* revisions.c's max_age -1 is special */
964 die("Invalid deepen-since: %s", line);
965 *deepen_rev_list = 1;
971 static int process_deepen_not(const char *line, struct string_list *deepen_not, int *deepen_rev_list)
974 if (skip_prefix(line, "deepen-not ", &arg)) {
976 struct object_id oid;
977 if (expand_ref(the_repository, arg, strlen(arg), &oid, &ref) != 1)
978 die("git upload-pack: ambiguous deepen-not: %s", line);
979 string_list_append(deepen_not, ref);
981 *deepen_rev_list = 1;
987 NORETURN __attribute__((format(printf,2,3)))
988 static void send_err_and_die(struct upload_pack_data *data,
989 const char *fmt, ...)
991 struct strbuf buf = STRBUF_INIT;
995 strbuf_vaddf(&buf, fmt, ap);
998 packet_writer_error(&data->writer, "%s", buf.buf);
1002 static void check_one_filter(struct upload_pack_data *data,
1003 struct list_objects_filter_options *opts)
1005 const char *key = list_object_filter_config_name(opts->choice);
1006 struct string_list_item *item = string_list_lookup(&data->allowed_filters,
1011 allowed = (intptr_t)item->util;
1013 allowed = data->allow_filter_fallback;
1016 send_err_and_die(data, "filter '%s' not supported", key);
1018 if (opts->choice == LOFC_TREE_DEPTH &&
1019 opts->tree_exclude_depth > data->tree_filter_max_depth)
1020 send_err_and_die(data,
1021 "tree filter allows max depth %lu, but got %lu",
1022 data->tree_filter_max_depth,
1023 opts->tree_exclude_depth);
1026 static void check_filter_recurse(struct upload_pack_data *data,
1027 struct list_objects_filter_options *opts)
1031 check_one_filter(data, opts);
1032 if (opts->choice != LOFC_COMBINE)
1035 for (i = 0; i < opts->sub_nr; i++)
1036 check_filter_recurse(data, &opts->sub[i]);
1039 static void die_if_using_banned_filter(struct upload_pack_data *data)
1041 check_filter_recurse(data, &data->filter_options);
1044 static void receive_needs(struct upload_pack_data *data,
1045 struct packet_reader *reader)
1047 int has_non_tip = 0;
1049 data->shallow_nr = 0;
1052 const char *features;
1053 struct object_id oid_buf;
1057 reset_timeout(data->timeout);
1058 if (packet_reader_read(reader) != PACKET_READ_NORMAL)
1061 if (process_shallow(reader->line, &data->shallows))
1063 if (process_deepen(reader->line, &data->depth))
1065 if (process_deepen_since(reader->line, &data->deepen_since, &data->deepen_rev_list))
1067 if (process_deepen_not(reader->line, &data->deepen_not, &data->deepen_rev_list))
1070 if (skip_prefix(reader->line, "filter ", &arg)) {
1071 if (!data->filter_capability_requested)
1072 die("git upload-pack: filtering capability not negotiated");
1073 list_objects_filter_die_if_populated(&data->filter_options);
1074 parse_list_objects_filter(&data->filter_options, arg);
1075 die_if_using_banned_filter(data);
1079 if (!skip_prefix(reader->line, "want ", &arg) ||
1080 parse_oid_hex(arg, &oid_buf, &features))
1081 die("git upload-pack: protocol error, "
1082 "expected to get object ID, not '%s'", reader->line);
1084 if (parse_feature_request(features, "deepen-relative"))
1085 data->deepen_relative = 1;
1086 if (parse_feature_request(features, "multi_ack_detailed"))
1087 data->multi_ack = MULTI_ACK_DETAILED;
1088 else if (parse_feature_request(features, "multi_ack"))
1089 data->multi_ack = MULTI_ACK;
1090 if (parse_feature_request(features, "no-done"))
1092 if (parse_feature_request(features, "thin-pack"))
1093 data->use_thin_pack = 1;
1094 if (parse_feature_request(features, "ofs-delta"))
1095 data->use_ofs_delta = 1;
1096 if (parse_feature_request(features, "side-band-64k"))
1097 data->use_sideband = LARGE_PACKET_MAX;
1098 else if (parse_feature_request(features, "side-band"))
1099 data->use_sideband = DEFAULT_PACKET_MAX;
1100 if (parse_feature_request(features, "no-progress"))
1101 data->no_progress = 1;
1102 if (parse_feature_request(features, "include-tag"))
1103 data->use_include_tag = 1;
1104 if (data->allow_filter &&
1105 parse_feature_request(features, "filter"))
1106 data->filter_capability_requested = 1;
1108 arg = parse_feature_value(features, "session-id", &feature_len, NULL);
1110 char *client_sid = xstrndup(arg, feature_len);
1111 trace2_data_string("transfer", NULL, "client-sid", client_sid);
1115 o = parse_object(the_repository, &oid_buf);
1117 packet_writer_error(&data->writer,
1118 "upload-pack: not our ref %s",
1119 oid_to_hex(&oid_buf));
1120 die("git upload-pack: not our ref %s",
1121 oid_to_hex(&oid_buf));
1123 if (!(o->flags & WANTED)) {
1125 if (!((data->allow_uor & ALLOW_ANY_SHA1) == ALLOW_ANY_SHA1
1126 || is_our_ref(o, data->allow_uor)))
1128 add_object_array(o, NULL, &data->want_obj);
1133 * We have sent all our refs already, and the other end
1134 * should have chosen out of them. When we are operating
1135 * in the stateless RPC mode, however, their choice may
1136 * have been based on the set of older refs advertised
1137 * by another process that handled the initial request.
1140 check_non_tip(data);
1142 if (!data->use_sideband && data->daemon_mode)
1143 data->no_progress = 1;
1145 if (data->depth == 0 && !data->deepen_rev_list && data->shallows.nr == 0)
1148 if (send_shallow_list(data))
1152 /* return non-zero if the ref is hidden, otherwise 0 */
1153 static int mark_our_ref(const char *refname, const char *refname_full,
1154 const struct object_id *oid)
1156 struct object *o = lookup_unknown_object(the_repository, oid);
1158 if (ref_is_hidden(refname, refname_full)) {
1159 o->flags |= HIDDEN_REF;
1162 o->flags |= OUR_REF;
1166 static int check_ref(const char *refname_full, const struct object_id *oid,
1167 int flag, void *cb_data)
1169 const char *refname = strip_namespace(refname_full);
1171 mark_our_ref(refname, refname_full, oid);
1175 static void format_symref_info(struct strbuf *buf, struct string_list *symref)
1177 struct string_list_item *item;
1181 for_each_string_list_item(item, symref)
1182 strbuf_addf(buf, " symref=%s:%s", item->string, (char *)item->util);
1185 static void format_session_id(struct strbuf *buf, struct upload_pack_data *d) {
1186 if (d->advertise_sid)
1187 strbuf_addf(buf, " session-id=%s", trace2_session_id());
1190 static int send_ref(const char *refname, const struct object_id *oid,
1191 int flag, void *cb_data)
1193 static const char *capabilities = "multi_ack thin-pack side-band"
1194 " side-band-64k ofs-delta shallow deepen-since deepen-not"
1195 " deepen-relative no-progress include-tag multi_ack_detailed";
1196 const char *refname_nons = strip_namespace(refname);
1197 struct object_id peeled;
1198 struct upload_pack_data *data = cb_data;
1200 if (mark_our_ref(refname_nons, refname, oid))
1204 struct strbuf symref_info = STRBUF_INIT;
1205 struct strbuf session_id = STRBUF_INIT;
1207 format_symref_info(&symref_info, &data->symref);
1208 format_session_id(&session_id, data);
1209 packet_write_fmt(1, "%s %s%c%s%s%s%s%s%s%s object-format=%s agent=%s\n",
1210 oid_to_hex(oid), refname_nons,
1212 (data->allow_uor & ALLOW_TIP_SHA1) ?
1213 " allow-tip-sha1-in-want" : "",
1214 (data->allow_uor & ALLOW_REACHABLE_SHA1) ?
1215 " allow-reachable-sha1-in-want" : "",
1216 data->stateless_rpc ? " no-done" : "",
1218 data->allow_filter ? " filter" : "",
1220 the_hash_algo->name,
1221 git_user_agent_sanitized());
1222 strbuf_release(&symref_info);
1223 strbuf_release(&session_id);
1225 packet_write_fmt(1, "%s %s\n", oid_to_hex(oid), refname_nons);
1227 capabilities = NULL;
1228 if (!peel_iterated_oid(oid, &peeled))
1229 packet_write_fmt(1, "%s %s^{}\n", oid_to_hex(&peeled), refname_nons);
1233 static int find_symref(const char *refname, const struct object_id *oid,
1234 int flag, void *cb_data)
1236 const char *symref_target;
1237 struct string_list_item *item;
1239 if ((flag & REF_ISSYMREF) == 0)
1241 symref_target = resolve_ref_unsafe(refname, 0, NULL, &flag);
1242 if (!symref_target || (flag & REF_ISSYMREF) == 0)
1243 die("'%s' is a symref but it is not?", refname);
1244 item = string_list_append(cb_data, strip_namespace(refname));
1245 item->util = xstrdup(strip_namespace(symref_target));
1249 static int parse_object_filter_config(const char *var, const char *value,
1250 struct upload_pack_data *data)
1252 struct strbuf buf = STRBUF_INIT;
1253 const char *sub, *key;
1256 if (parse_config_key(var, "uploadpackfilter", &sub, &sub_len, &key))
1260 if (!strcmp(key, "allow"))
1261 data->allow_filter_fallback = git_config_bool(var, value);
1265 strbuf_add(&buf, sub, sub_len);
1267 if (!strcmp(key, "allow"))
1268 string_list_insert(&data->allowed_filters, buf.buf)->util =
1269 (void *)(intptr_t)git_config_bool(var, value);
1270 else if (!strcmp(buf.buf, "tree") && !strcmp(key, "maxdepth")) {
1272 strbuf_release(&buf);
1273 return config_error_nonbool(var);
1275 string_list_insert(&data->allowed_filters, buf.buf)->util =
1276 (void *)(intptr_t)1;
1277 data->tree_filter_max_depth = git_config_ulong(var, value);
1280 strbuf_release(&buf);
1284 static int upload_pack_config(const char *var, const char *value, void *cb_data)
1286 struct upload_pack_data *data = cb_data;
1288 if (!strcmp("uploadpack.allowtipsha1inwant", var)) {
1289 if (git_config_bool(var, value))
1290 data->allow_uor |= ALLOW_TIP_SHA1;
1292 data->allow_uor &= ~ALLOW_TIP_SHA1;
1293 } else if (!strcmp("uploadpack.allowreachablesha1inwant", var)) {
1294 if (git_config_bool(var, value))
1295 data->allow_uor |= ALLOW_REACHABLE_SHA1;
1297 data->allow_uor &= ~ALLOW_REACHABLE_SHA1;
1298 } else if (!strcmp("uploadpack.allowanysha1inwant", var)) {
1299 if (git_config_bool(var, value))
1300 data->allow_uor |= ALLOW_ANY_SHA1;
1302 data->allow_uor &= ~ALLOW_ANY_SHA1;
1303 } else if (!strcmp("uploadpack.keepalive", var)) {
1304 data->keepalive = git_config_int(var, value);
1305 if (!data->keepalive)
1306 data->keepalive = -1;
1307 } else if (!strcmp("uploadpack.allowfilter", var)) {
1308 data->allow_filter = git_config_bool(var, value);
1309 } else if (!strcmp("uploadpack.allowrefinwant", var)) {
1310 data->allow_ref_in_want = git_config_bool(var, value);
1311 } else if (!strcmp("uploadpack.allowsidebandall", var)) {
1312 data->allow_sideband_all = git_config_bool(var, value);
1313 } else if (!strcmp("core.precomposeunicode", var)) {
1314 precomposed_unicode = git_config_bool(var, value);
1315 } else if (!strcmp("transfer.advertisesid", var)) {
1316 data->advertise_sid = git_config_bool(var, value);
1319 if (current_config_scope() != CONFIG_SCOPE_LOCAL &&
1320 current_config_scope() != CONFIG_SCOPE_WORKTREE) {
1321 if (!strcmp("uploadpack.packobjectshook", var))
1322 return git_config_string(&data->pack_objects_hook, var, value);
1325 if (parse_object_filter_config(var, value, data) < 0)
1328 return parse_hide_refs_config(var, value, "uploadpack");
1331 void upload_pack(struct upload_pack_options *options)
1333 struct packet_reader reader;
1334 struct upload_pack_data data;
1336 upload_pack_data_init(&data);
1338 git_config(upload_pack_config, &data);
1340 data.stateless_rpc = options->stateless_rpc;
1341 data.daemon_mode = options->daemon_mode;
1342 data.timeout = options->timeout;
1344 head_ref_namespaced(find_symref, &data.symref);
1346 if (options->advertise_refs || !data.stateless_rpc) {
1347 reset_timeout(data.timeout);
1348 head_ref_namespaced(send_ref, &data);
1349 for_each_namespaced_ref(send_ref, &data);
1350 advertise_shallow_grafts(1);
1353 head_ref_namespaced(check_ref, NULL);
1354 for_each_namespaced_ref(check_ref, NULL);
1357 if (!options->advertise_refs) {
1358 packet_reader_init(&reader, 0, NULL, 0,
1359 PACKET_READ_CHOMP_NEWLINE |
1360 PACKET_READ_DIE_ON_ERR_PACKET);
1362 receive_needs(&data, &reader);
1365 * An EOF at this exact point in negotiation should be
1366 * acceptable from stateless clients as they will consume the
1367 * shallow list before doing subsequent rpc with haves/etc.
1369 if (data.stateless_rpc)
1370 reader.options |= PACKET_READ_GENTLE_ON_EOF;
1372 if (data.want_obj.nr &&
1373 packet_reader_peek(&reader) != PACKET_READ_EOF) {
1374 reader.options &= ~PACKET_READ_GENTLE_ON_EOF;
1375 get_common_commits(&data, &reader);
1376 create_pack_file(&data, NULL);
1380 upload_pack_data_clear(&data);
1383 static int parse_want(struct packet_writer *writer, const char *line,
1384 struct object_array *want_obj)
1387 if (skip_prefix(line, "want ", &arg)) {
1388 struct object_id oid;
1391 if (get_oid_hex(arg, &oid))
1392 die("git upload-pack: protocol error, "
1393 "expected to get oid, not '%s'", line);
1395 o = parse_object(the_repository, &oid);
1397 packet_writer_error(writer,
1398 "upload-pack: not our ref %s",
1400 die("git upload-pack: not our ref %s",
1404 if (!(o->flags & WANTED)) {
1406 add_object_array(o, NULL, want_obj);
1415 static int parse_want_ref(struct packet_writer *writer, const char *line,
1416 struct string_list *wanted_refs,
1417 struct object_array *want_obj)
1420 if (skip_prefix(line, "want-ref ", &arg)) {
1421 struct object_id oid;
1422 struct string_list_item *item;
1425 if (read_ref(arg, &oid)) {
1426 packet_writer_error(writer, "unknown ref %s", arg);
1427 die("unknown ref %s", arg);
1430 item = string_list_append(wanted_refs, arg);
1431 item->util = oiddup(&oid);
1433 o = parse_object_or_die(&oid, arg);
1434 if (!(o->flags & WANTED)) {
1436 add_object_array(o, NULL, want_obj);
1445 static int parse_have(const char *line, struct oid_array *haves)
1448 if (skip_prefix(line, "have ", &arg)) {
1449 struct object_id oid;
1451 if (get_oid_hex(arg, &oid))
1452 die("git upload-pack: expected SHA1 object, got '%s'", arg);
1453 oid_array_append(haves, &oid);
1460 static void process_args(struct packet_reader *request,
1461 struct upload_pack_data *data)
1463 while (packet_reader_read(request) == PACKET_READ_NORMAL) {
1464 const char *arg = request->line;
1468 if (parse_want(&data->writer, arg, &data->want_obj))
1470 if (data->allow_ref_in_want &&
1471 parse_want_ref(&data->writer, arg, &data->wanted_refs,
1474 /* process have line */
1475 if (parse_have(arg, &data->haves))
1478 /* process args like thin-pack */
1479 if (!strcmp(arg, "thin-pack")) {
1480 data->use_thin_pack = 1;
1483 if (!strcmp(arg, "ofs-delta")) {
1484 data->use_ofs_delta = 1;
1487 if (!strcmp(arg, "no-progress")) {
1488 data->no_progress = 1;
1491 if (!strcmp(arg, "include-tag")) {
1492 data->use_include_tag = 1;
1495 if (!strcmp(arg, "done")) {
1500 /* Shallow related arguments */
1501 if (process_shallow(arg, &data->shallows))
1503 if (process_deepen(arg, &data->depth))
1505 if (process_deepen_since(arg, &data->deepen_since,
1506 &data->deepen_rev_list))
1508 if (process_deepen_not(arg, &data->deepen_not,
1509 &data->deepen_rev_list))
1511 if (!strcmp(arg, "deepen-relative")) {
1512 data->deepen_relative = 1;
1516 if (data->allow_filter && skip_prefix(arg, "filter ", &p)) {
1517 list_objects_filter_die_if_populated(&data->filter_options);
1518 parse_list_objects_filter(&data->filter_options, p);
1519 die_if_using_banned_filter(data);
1523 if ((git_env_bool("GIT_TEST_SIDEBAND_ALL", 0) ||
1524 data->allow_sideband_all) &&
1525 !strcmp(arg, "sideband-all")) {
1526 data->writer.use_sideband = 1;
1530 if (skip_prefix(arg, "packfile-uris ", &p)) {
1531 string_list_split(&data->uri_protocols, p, ',', -1);
1535 /* ignore unknown lines maybe? */
1536 die("unexpected line: '%s'", arg);
1539 if (data->uri_protocols.nr && !data->writer.use_sideband)
1540 string_list_clear(&data->uri_protocols, 0);
1542 if (request->status != PACKET_READ_FLUSH)
1543 die(_("expected flush after fetch arguments"));
1546 static int process_haves(struct upload_pack_data *data, struct oid_array *common)
1551 for (i = 0; i < data->haves.nr; i++) {
1552 const struct object_id *oid = &data->haves.oid[i];
1554 if (!has_object_file_with_flags(oid,
1555 OBJECT_INFO_QUICK | OBJECT_INFO_SKIP_FETCH_OBJECT))
1558 oid_array_append(common, oid);
1560 do_got_oid(data, oid);
1566 static int send_acks(struct upload_pack_data *data, struct oid_array *acks)
1570 packet_writer_write(&data->writer, "acknowledgments\n");
1574 packet_writer_write(&data->writer, "NAK\n");
1576 for (i = 0; i < acks->nr; i++) {
1577 packet_writer_write(&data->writer, "ACK %s\n",
1578 oid_to_hex(&acks->oid[i]));
1581 if (ok_to_give_up(data)) {
1583 packet_writer_write(&data->writer, "ready\n");
1590 static int process_haves_and_send_acks(struct upload_pack_data *data)
1592 struct oid_array common = OID_ARRAY_INIT;
1595 process_haves(data, &common);
1598 } else if (send_acks(data, &common)) {
1599 packet_writer_delim(&data->writer);
1603 packet_writer_flush(&data->writer);
1607 oid_array_clear(&data->haves);
1608 oid_array_clear(&common);
1612 static void send_wanted_ref_info(struct upload_pack_data *data)
1614 const struct string_list_item *item;
1616 if (!data->wanted_refs.nr)
1619 packet_writer_write(&data->writer, "wanted-refs\n");
1621 for_each_string_list_item(item, &data->wanted_refs) {
1622 packet_writer_write(&data->writer, "%s %s\n",
1623 oid_to_hex(item->util),
1627 packet_writer_delim(&data->writer);
1630 static void send_shallow_info(struct upload_pack_data *data)
1632 /* No shallow info needs to be sent */
1633 if (!data->depth && !data->deepen_rev_list && !data->shallows.nr &&
1634 !is_repository_shallow(the_repository))
1637 packet_writer_write(&data->writer, "shallow-info\n");
1639 if (!send_shallow_list(data) &&
1640 is_repository_shallow(the_repository))
1641 deepen(data, INFINITE_DEPTH);
1647 FETCH_PROCESS_ARGS = 0,
1653 int upload_pack_v2(struct repository *r, struct strvec *keys,
1654 struct packet_reader *request)
1656 enum fetch_state state = FETCH_PROCESS_ARGS;
1657 struct upload_pack_data data;
1659 clear_object_flags(ALL_FLAGS);
1661 upload_pack_data_init(&data);
1662 data.use_sideband = LARGE_PACKET_MAX;
1664 git_config(upload_pack_config, &data);
1666 while (state != FETCH_DONE) {
1668 case FETCH_PROCESS_ARGS:
1669 process_args(request, &data);
1671 if (!data.want_obj.nr) {
1673 * Request didn't contain any 'want' lines,
1674 * guess they didn't want anything.
1677 } else if (data.haves.nr) {
1679 * Request had 'have' lines, so lets ACK them.
1681 state = FETCH_SEND_ACKS;
1684 * Request had 'want's but no 'have's so we can
1685 * immedietly go to construct and send a pack.
1687 state = FETCH_SEND_PACK;
1690 case FETCH_SEND_ACKS:
1691 if (process_haves_and_send_acks(&data))
1692 state = FETCH_SEND_PACK;
1696 case FETCH_SEND_PACK:
1697 send_wanted_ref_info(&data);
1698 send_shallow_info(&data);
1700 if (data.uri_protocols.nr) {
1701 create_pack_file(&data, &data.uri_protocols);
1703 packet_writer_write(&data.writer, "packfile\n");
1704 create_pack_file(&data, NULL);
1713 upload_pack_data_clear(&data);
1717 int upload_pack_advertise(struct repository *r,
1718 struct strbuf *value)
1721 int allow_filter_value;
1722 int allow_ref_in_want;
1723 int allow_sideband_all_value;
1726 strbuf_addstr(value, "shallow");
1728 if (!repo_config_get_bool(the_repository,
1729 "uploadpack.allowfilter",
1730 &allow_filter_value) &&
1732 strbuf_addstr(value, " filter");
1734 if (!repo_config_get_bool(the_repository,
1735 "uploadpack.allowrefinwant",
1736 &allow_ref_in_want) &&
1738 strbuf_addstr(value, " ref-in-want");
1740 if (git_env_bool("GIT_TEST_SIDEBAND_ALL", 0) ||
1741 (!repo_config_get_bool(the_repository,
1742 "uploadpack.allowsidebandall",
1743 &allow_sideband_all_value) &&
1744 allow_sideband_all_value))
1745 strbuf_addstr(value, " sideband-all");
1747 if (!repo_config_get_string(the_repository,
1748 "uploadpack.blobpackfileuri",
1751 strbuf_addstr(value, " packfile-uris");