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;
49 static int use_thin_pack, use_ofs_delta, use_include_tag;
50 static int no_progress, daemon_mode;
51 /* Allow specifying sha1 if it is a ref tip. */
52 #define ALLOW_TIP_SHA1 01
53 /* Allow request of a sha1 if it is reachable from a ref (possibly hidden ref). */
54 #define ALLOW_REACHABLE_SHA1 02
55 /* Allow request of any sha1. Implies ALLOW_TIP_SHA1 and ALLOW_REACHABLE_SHA1. */
56 #define ALLOW_ANY_SHA1 07
57 static unsigned int allow_unadvertised_object_request;
58 static int shallow_nr;
59 static struct object_array extra_edge_obj;
60 static unsigned int timeout;
61 static int keepalive = 5;
63 * otherwise maximum packet size (up to 65520 bytes).
65 static int use_sideband;
66 static int stateless_rpc;
67 static const char *pack_objects_hook;
69 static int filter_capability_requested;
70 static int allow_filter;
71 static int allow_ref_in_want;
73 static int allow_sideband_all;
75 struct upload_pack_data {
76 struct string_list symref;
77 struct string_list wanted_refs;
78 struct object_array want_obj;
79 struct object_array have_obj;
80 struct oid_array haves;
82 struct object_array shallows;
83 struct string_list deepen_not;
85 timestamp_t deepen_since;
89 struct list_objects_filter_options filter_options;
91 struct packet_writer writer;
93 unsigned stateless_rpc : 1;
95 unsigned use_thin_pack : 1;
96 unsigned use_ofs_delta : 1;
97 unsigned no_progress : 1;
98 unsigned use_include_tag : 1;
102 static void upload_pack_data_init(struct upload_pack_data *data)
104 struct string_list symref = STRING_LIST_INIT_DUP;
105 struct string_list wanted_refs = STRING_LIST_INIT_DUP;
106 struct object_array want_obj = OBJECT_ARRAY_INIT;
107 struct object_array have_obj = OBJECT_ARRAY_INIT;
108 struct oid_array haves = OID_ARRAY_INIT;
109 struct object_array shallows = OBJECT_ARRAY_INIT;
110 struct string_list deepen_not = STRING_LIST_INIT_DUP;
112 memset(data, 0, sizeof(*data));
113 data->symref = symref;
114 data->wanted_refs = wanted_refs;
115 data->want_obj = want_obj;
116 data->have_obj = have_obj;
118 data->shallows = shallows;
119 data->deepen_not = deepen_not;
120 packet_writer_init(&data->writer, 1);
123 static void upload_pack_data_clear(struct upload_pack_data *data)
125 string_list_clear(&data->symref, 1);
126 string_list_clear(&data->wanted_refs, 1);
127 object_array_clear(&data->want_obj);
128 object_array_clear(&data->have_obj);
129 oid_array_clear(&data->haves);
130 object_array_clear(&data->shallows);
131 string_list_clear(&data->deepen_not, 0);
132 list_objects_filter_release(&data->filter_options);
135 static void reset_timeout(void)
140 static void send_client_data(int fd, const char *data, ssize_t sz)
143 send_sideband(1, fd, data, sz, use_sideband);
150 /* XXX: are we happy to lose stuff here? */
151 xwrite(fd, data, sz);
154 write_or_die(fd, data, sz);
157 static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
160 if (graft->nr_parent == -1)
161 fprintf(fp, "--shallow %s\n", oid_to_hex(&graft->oid));
165 static void create_pack_file(const struct object_array *have_obj,
166 const struct object_array *want_obj,
167 struct list_objects_filter_options *filter_options)
169 struct child_process pack_objects = CHILD_PROCESS_INIT;
170 char data[8193], progress[128];
171 char abort_msg[] = "aborting due to possible repository "
172 "corruption on the remote side.";
178 if (!pack_objects_hook)
179 pack_objects.git_cmd = 1;
181 argv_array_push(&pack_objects.args, pack_objects_hook);
182 argv_array_push(&pack_objects.args, "git");
183 pack_objects.use_shell = 1;
187 argv_array_push(&pack_objects.args, "--shallow-file");
188 argv_array_push(&pack_objects.args, "");
190 argv_array_push(&pack_objects.args, "pack-objects");
191 argv_array_push(&pack_objects.args, "--revs");
193 argv_array_push(&pack_objects.args, "--thin");
195 argv_array_push(&pack_objects.args, "--stdout");
197 argv_array_push(&pack_objects.args, "--shallow");
199 argv_array_push(&pack_objects.args, "--progress");
201 argv_array_push(&pack_objects.args, "--delta-base-offset");
203 argv_array_push(&pack_objects.args, "--include-tag");
204 if (filter_options->choice) {
206 expand_list_objects_filter_spec(filter_options);
207 if (pack_objects.use_shell) {
208 struct strbuf buf = STRBUF_INIT;
209 sq_quote_buf(&buf, spec);
210 argv_array_pushf(&pack_objects.args, "--filter=%s", buf.buf);
211 strbuf_release(&buf);
213 argv_array_pushf(&pack_objects.args, "--filter=%s",
218 pack_objects.in = -1;
219 pack_objects.out = -1;
220 pack_objects.err = -1;
222 if (start_command(&pack_objects))
223 die("git upload-pack: unable to fork git-pack-objects");
225 pipe_fd = xfdopen(pack_objects.in, "w");
228 for_each_commit_graft(write_one_shallow, pipe_fd);
230 for (i = 0; i < want_obj->nr; i++)
231 fprintf(pipe_fd, "%s\n",
232 oid_to_hex(&want_obj->objects[i].item->oid));
233 fprintf(pipe_fd, "--not\n");
234 for (i = 0; i < have_obj->nr; i++)
235 fprintf(pipe_fd, "%s\n",
236 oid_to_hex(&have_obj->objects[i].item->oid));
237 for (i = 0; i < extra_edge_obj.nr; i++)
238 fprintf(pipe_fd, "%s\n",
239 oid_to_hex(&extra_edge_obj.objects[i].item->oid));
240 fprintf(pipe_fd, "\n");
244 /* We read from pack_objects.err to capture stderr output for
245 * progress bar, and pack_objects.out to capture the pack data.
249 struct pollfd pfd[2];
250 int pe, pu, pollsize;
258 if (0 <= pack_objects.out) {
259 pfd[pollsize].fd = pack_objects.out;
260 pfd[pollsize].events = POLLIN;
264 if (0 <= pack_objects.err) {
265 pfd[pollsize].fd = pack_objects.err;
266 pfd[pollsize].events = POLLIN;
274 ret = poll(pfd, pollsize,
275 keepalive < 0 ? -1 : 1000 * keepalive);
278 if (errno != EINTR) {
279 error_errno("poll failed, resuming");
284 if (0 <= pe && (pfd[pe].revents & (POLLIN|POLLHUP))) {
285 /* Status ready; we ship that in the side-band
286 * or dump to the standard error.
288 sz = xread(pack_objects.err, progress,
291 send_client_data(2, progress, sz);
293 close(pack_objects.err);
294 pack_objects.err = -1;
298 /* give priority to status messages */
301 if (0 <= pu && (pfd[pu].revents & (POLLIN|POLLHUP))) {
302 /* Data ready; we keep the last byte to ourselves
303 * in case we detect broken rev-list, so that we
304 * can leave the stream corrupted. This is
305 * unfortunate -- unpack-objects would happily
306 * accept a valid packdata with trailing garbage,
307 * so appending garbage after we pass all the
308 * pack data is not good enough to signal
309 * breakage to downstream.
317 sz = xread(pack_objects.out, cp,
318 sizeof(data) - outsz);
322 close(pack_objects.out);
323 pack_objects.out = -1;
329 buffered = data[sz-1] & 0xFF;
334 send_client_data(1, data, sz);
338 * We hit the keepalive timeout without saying anything; send
339 * an empty message on the data sideband just to let the other
340 * side know we're still working on it, but don't have any data
343 * If we don't have a sideband channel, there's no room in the
344 * protocol to say anything, so those clients are just out of
347 if (!ret && use_sideband) {
348 static const char buf[] = "0005\1";
349 write_or_die(1, buf, 5);
353 if (finish_command(&pack_objects)) {
354 error("git upload-pack: git-pack-objects died with error.");
361 send_client_data(1, data, 1);
362 fprintf(stderr, "flushed.\n");
369 send_client_data(3, abort_msg, sizeof(abort_msg));
370 die("git upload-pack: %s", abort_msg);
373 static int got_oid(const char *hex, struct object_id *oid,
374 struct object_array *have_obj)
377 int we_knew_they_have = 0;
379 if (get_oid_hex(hex, oid))
380 die("git upload-pack: expected SHA1 object, got '%s'", hex);
381 if (!has_object_file(oid))
384 o = parse_object(the_repository, oid);
386 die("oops (%s)", oid_to_hex(oid));
387 if (o->type == OBJ_COMMIT) {
388 struct commit_list *parents;
389 struct commit *commit = (struct commit *)o;
390 if (o->flags & THEY_HAVE)
391 we_knew_they_have = 1;
393 o->flags |= THEY_HAVE;
394 if (!oldest_have || (commit->date < oldest_have))
395 oldest_have = commit->date;
396 for (parents = commit->parents;
398 parents = parents->next)
399 parents->item->object.flags |= THEY_HAVE;
401 if (!we_knew_they_have) {
402 add_object_array(o, NULL, have_obj);
408 static int ok_to_give_up(const struct object_array *have_obj,
409 struct object_array *want_obj)
411 uint32_t min_generation = GENERATION_NUMBER_ZERO;
416 return can_all_from_reach_with_flag(want_obj, THEY_HAVE,
417 COMMON_KNOWN, oldest_have,
421 static int get_common_commits(struct upload_pack_data *data,
422 struct packet_reader *reader)
424 struct object_id oid;
425 char last_hex[GIT_MAX_HEXSZ + 1];
430 save_commit_buffer = 0;
437 if (packet_reader_read(reader) != PACKET_READ_NORMAL) {
441 && ok_to_give_up(&data->have_obj, &data->want_obj)) {
443 packet_write_fmt(1, "ACK %s ready\n", last_hex);
445 if (data->have_obj.nr == 0 || multi_ack)
446 packet_write_fmt(1, "NAK\n");
448 if (no_done && sent_ready) {
449 packet_write_fmt(1, "ACK %s\n", last_hex);
458 if (skip_prefix(reader->line, "have ", &arg)) {
459 switch (got_oid(arg, &oid, &data->have_obj)) {
460 case -1: /* they have what we do not */
463 && ok_to_give_up(&data->have_obj, &data->want_obj)) {
464 const char *hex = oid_to_hex(&oid);
465 if (multi_ack == 2) {
467 packet_write_fmt(1, "ACK %s ready\n", hex);
469 packet_write_fmt(1, "ACK %s continue\n", hex);
474 oid_to_hex_r(last_hex, &oid);
476 packet_write_fmt(1, "ACK %s common\n", last_hex);
478 packet_write_fmt(1, "ACK %s continue\n", last_hex);
479 else if (data->have_obj.nr == 1)
480 packet_write_fmt(1, "ACK %s\n", last_hex);
485 if (!strcmp(reader->line, "done")) {
486 if (data->have_obj.nr > 0) {
488 packet_write_fmt(1, "ACK %s\n", last_hex);
491 packet_write_fmt(1, "NAK\n");
494 die("git upload-pack: expected SHA1 list, got '%s'", reader->line);
498 static int is_our_ref(struct object *o)
500 int allow_hidden_ref = (allow_unadvertised_object_request &
501 (ALLOW_TIP_SHA1 | ALLOW_REACHABLE_SHA1));
502 return o->flags & ((allow_hidden_ref ? HIDDEN_REF : 0) | OUR_REF);
506 * on successful case, it's up to the caller to close cmd->out
508 static int do_reachable_revlist(struct child_process *cmd,
509 struct object_array *src,
510 struct object_array *reachable)
512 static const char *argv[] = {
513 "rev-list", "--stdin", NULL,
516 char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */
518 const unsigned hexsz = the_hash_algo->hexsz;
527 * If the next rev-list --stdin encounters an unknown commit,
528 * it terminates, which will cause SIGPIPE in the write loop
531 sigchain_push(SIGPIPE, SIG_IGN);
533 if (start_command(cmd))
537 namebuf[hexsz + 1] = '\n';
538 for (i = get_max_object_index(); 0 < i; ) {
539 o = get_indexed_object(--i);
542 if (reachable && o->type == OBJ_COMMIT)
543 o->flags &= ~TMP_MARK;
546 memcpy(namebuf + 1, oid_to_hex(&o->oid), hexsz);
547 if (write_in_full(cmd->in, namebuf, hexsz + 2) < 0)
550 namebuf[hexsz] = '\n';
551 for (i = 0; i < src->nr; i++) {
552 o = src->objects[i].item;
555 add_object_array(o, NULL, reachable);
558 if (reachable && o->type == OBJ_COMMIT)
559 o->flags |= TMP_MARK;
560 memcpy(namebuf, oid_to_hex(&o->oid), hexsz);
561 if (write_in_full(cmd->in, namebuf, hexsz + 1) < 0)
566 sigchain_pop(SIGPIPE);
571 sigchain_pop(SIGPIPE);
580 static int get_reachable_list(struct object_array *src,
581 struct object_array *reachable)
583 struct child_process cmd = CHILD_PROCESS_INIT;
586 char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */
587 const unsigned hexsz = the_hash_algo->hexsz;
589 if (do_reachable_revlist(&cmd, src, reachable) < 0)
592 while ((i = read_in_full(cmd.out, namebuf, hexsz + 1)) == hexsz + 1) {
593 struct object_id oid;
596 if (parse_oid_hex(namebuf, &oid, &p) || *p != '\n')
599 o = lookup_object(the_repository, &oid);
600 if (o && o->type == OBJ_COMMIT) {
601 o->flags &= ~TMP_MARK;
604 for (i = get_max_object_index(); 0 < i; i--) {
605 o = get_indexed_object(i - 1);
606 if (o && o->type == OBJ_COMMIT &&
607 (o->flags & TMP_MARK)) {
608 add_object_array(o, NULL, reachable);
609 o->flags &= ~TMP_MARK;
614 if (finish_command(&cmd))
620 static int has_unreachable(struct object_array *src)
622 struct child_process cmd = CHILD_PROCESS_INIT;
626 if (do_reachable_revlist(&cmd, src, NULL) < 0)
630 * The commits out of the rev-list are not ancestors of
633 i = read_in_full(cmd.out, buf, 1);
640 * rev-list may have died by encountering a bad commit
641 * in the history, in which case we do want to bail out
642 * even when it showed no commit.
644 if (finish_command(&cmd))
647 /* All the non-tip ones are ancestors of what we advertised */
651 sigchain_pop(SIGPIPE);
657 static void check_non_tip(struct upload_pack_data *data)
662 * In the normal in-process case without
663 * uploadpack.allowReachableSHA1InWant,
664 * non-tip requests can never happen.
666 if (!stateless_rpc && !(allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1))
668 if (!has_unreachable(&data->want_obj))
669 /* All the non-tip ones are ancestors of what we advertised */
673 /* Pick one of them (we know there at least is one) */
674 for (i = 0; i < data->want_obj.nr; i++) {
675 struct object *o = data->want_obj.objects[i].item;
676 if (!is_our_ref(o)) {
677 packet_writer_error(&data->writer,
678 "upload-pack: not our ref %s",
679 oid_to_hex(&o->oid));
680 die("git upload-pack: not our ref %s",
681 oid_to_hex(&o->oid));
686 static void send_shallow(struct packet_writer *writer,
687 struct commit_list *result)
690 struct object *object = &result->item->object;
691 if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) {
692 packet_writer_write(writer, "shallow %s",
693 oid_to_hex(&object->oid));
694 register_shallow(the_repository, &object->oid);
697 result = result->next;
701 static void send_unshallow(struct packet_writer *writer,
702 const struct object_array *shallows,
703 struct object_array *want_obj)
707 for (i = 0; i < shallows->nr; i++) {
708 struct object *object = shallows->objects[i].item;
709 if (object->flags & NOT_SHALLOW) {
710 struct commit_list *parents;
711 packet_writer_write(writer, "unshallow %s",
712 oid_to_hex(&object->oid));
713 object->flags &= ~CLIENT_SHALLOW;
715 * We want to _register_ "object" as shallow, but we
716 * also need to traverse object's parents to deepen a
717 * shallow clone. Unregister it for now so we can
718 * parse and add the parents to the want list, then
721 unregister_shallow(&object->oid);
723 parse_commit_or_die((struct commit *)object);
724 parents = ((struct commit *)object)->parents;
726 add_object_array(&parents->item->object,
728 parents = parents->next;
730 add_object_array(object, NULL, &extra_edge_obj);
732 /* make sure commit traversal conforms to client */
733 register_shallow(the_repository, &object->oid);
737 static int check_ref(const char *refname_full, const struct object_id *oid,
738 int flag, void *cb_data);
739 static void deepen(struct packet_writer *writer, int depth, int deepen_relative,
740 struct object_array *shallows, struct object_array *want_obj)
742 if (depth == INFINITE_DEPTH && !is_repository_shallow(the_repository)) {
745 for (i = 0; i < shallows->nr; i++) {
746 struct object *object = shallows->objects[i].item;
747 object->flags |= NOT_SHALLOW;
749 } else if (deepen_relative) {
750 struct object_array reachable_shallows = OBJECT_ARRAY_INIT;
751 struct commit_list *result;
754 * Checking for reachable shallows requires that our refs be
755 * marked with OUR_REF.
757 head_ref_namespaced(check_ref, NULL);
758 for_each_namespaced_ref(check_ref, NULL);
760 get_reachable_list(shallows, &reachable_shallows);
761 result = get_shallow_commits(&reachable_shallows,
763 SHALLOW, NOT_SHALLOW);
764 send_shallow(writer, result);
765 free_commit_list(result);
766 object_array_clear(&reachable_shallows);
768 struct commit_list *result;
770 result = get_shallow_commits(want_obj, depth,
771 SHALLOW, NOT_SHALLOW);
772 send_shallow(writer, result);
773 free_commit_list(result);
776 send_unshallow(writer, shallows, want_obj);
779 static void deepen_by_rev_list(struct packet_writer *writer, int ac,
781 struct object_array *shallows,
782 struct object_array *want_obj)
784 struct commit_list *result;
786 disable_commit_graph(the_repository);
787 result = get_shallow_commits_by_rev_list(ac, av, SHALLOW, NOT_SHALLOW);
788 send_shallow(writer, result);
789 free_commit_list(result);
790 send_unshallow(writer, shallows, want_obj);
793 /* Returns 1 if a shallow list is sent or 0 otherwise */
794 static int send_shallow_list(struct packet_writer *writer,
795 int depth, int deepen_rev_list,
796 timestamp_t deepen_since,
797 struct string_list *deepen_not,
799 struct object_array *shallows,
800 struct object_array *want_obj)
804 if (depth > 0 && deepen_rev_list)
805 die("git upload-pack: deepen and deepen-since (or deepen-not) cannot be used together");
807 deepen(writer, depth, deepen_relative, shallows, want_obj);
809 } else if (deepen_rev_list) {
810 struct argv_array av = ARGV_ARRAY_INIT;
813 argv_array_push(&av, "rev-list");
815 argv_array_pushf(&av, "--max-age=%"PRItime, deepen_since);
816 if (deepen_not->nr) {
817 argv_array_push(&av, "--not");
818 for (i = 0; i < deepen_not->nr; i++) {
819 struct string_list_item *s = deepen_not->items + i;
820 argv_array_push(&av, s->string);
822 argv_array_push(&av, "--not");
824 for (i = 0; i < want_obj->nr; i++) {
825 struct object *o = want_obj->objects[i].item;
826 argv_array_push(&av, oid_to_hex(&o->oid));
828 deepen_by_rev_list(writer, av.argc, av.argv, shallows, want_obj);
829 argv_array_clear(&av);
832 if (shallows->nr > 0) {
834 for (i = 0; i < shallows->nr; i++)
835 register_shallow(the_repository,
836 &shallows->objects[i].item->oid);
840 shallow_nr += shallows->nr;
844 static int process_shallow(const char *line, struct object_array *shallows)
847 if (skip_prefix(line, "shallow ", &arg)) {
848 struct object_id oid;
849 struct object *object;
850 if (get_oid_hex(arg, &oid))
851 die("invalid shallow line: %s", line);
852 object = parse_object(the_repository, &oid);
855 if (object->type != OBJ_COMMIT)
856 die("invalid shallow object %s", oid_to_hex(&oid));
857 if (!(object->flags & CLIENT_SHALLOW)) {
858 object->flags |= CLIENT_SHALLOW;
859 add_object_array(object, NULL, shallows);
867 static int process_deepen(const char *line, int *depth)
870 if (skip_prefix(line, "deepen ", &arg)) {
872 *depth = (int)strtol(arg, &end, 0);
873 if (!end || *end || *depth <= 0)
874 die("Invalid deepen: %s", line);
881 static int process_deepen_since(const char *line, timestamp_t *deepen_since, int *deepen_rev_list)
884 if (skip_prefix(line, "deepen-since ", &arg)) {
886 *deepen_since = parse_timestamp(arg, &end, 0);
887 if (!end || *end || !deepen_since ||
888 /* revisions.c's max_age -1 is special */
890 die("Invalid deepen-since: %s", line);
891 *deepen_rev_list = 1;
897 static int process_deepen_not(const char *line, struct string_list *deepen_not, int *deepen_rev_list)
900 if (skip_prefix(line, "deepen-not ", &arg)) {
902 struct object_id oid;
903 if (expand_ref(the_repository, arg, strlen(arg), &oid, &ref) != 1)
904 die("git upload-pack: ambiguous deepen-not: %s", line);
905 string_list_append(deepen_not, ref);
907 *deepen_rev_list = 1;
913 static void receive_needs(struct upload_pack_data *data,
914 struct packet_reader *reader)
916 struct object_array shallows = OBJECT_ARRAY_INIT;
917 struct string_list deepen_not = STRING_LIST_INIT_DUP;
920 timestamp_t deepen_since = 0;
921 int deepen_rev_list = 0;
922 int deepen_relative = 0;
927 const char *features;
928 struct object_id oid_buf;
932 if (packet_reader_read(reader) != PACKET_READ_NORMAL)
935 if (process_shallow(reader->line, &shallows))
937 if (process_deepen(reader->line, &depth))
939 if (process_deepen_since(reader->line, &deepen_since, &deepen_rev_list))
941 if (process_deepen_not(reader->line, &deepen_not, &deepen_rev_list))
944 if (skip_prefix(reader->line, "filter ", &arg)) {
945 if (!filter_capability_requested)
946 die("git upload-pack: filtering capability not negotiated");
947 list_objects_filter_die_if_populated(&data->filter_options);
948 parse_list_objects_filter(&data->filter_options, arg);
952 if (!skip_prefix(reader->line, "want ", &arg) ||
953 parse_oid_hex(arg, &oid_buf, &features))
954 die("git upload-pack: protocol error, "
955 "expected to get object ID, not '%s'", reader->line);
957 if (parse_feature_request(features, "deepen-relative"))
959 if (parse_feature_request(features, "multi_ack_detailed"))
961 else if (parse_feature_request(features, "multi_ack"))
963 if (parse_feature_request(features, "no-done"))
965 if (parse_feature_request(features, "thin-pack"))
967 if (parse_feature_request(features, "ofs-delta"))
969 if (parse_feature_request(features, "side-band-64k"))
970 use_sideband = LARGE_PACKET_MAX;
971 else if (parse_feature_request(features, "side-band"))
972 use_sideband = DEFAULT_PACKET_MAX;
973 if (parse_feature_request(features, "no-progress"))
975 if (parse_feature_request(features, "include-tag"))
977 if (allow_filter && parse_feature_request(features, "filter"))
978 filter_capability_requested = 1;
980 o = parse_object(the_repository, &oid_buf);
982 packet_writer_error(&data->writer,
983 "upload-pack: not our ref %s",
984 oid_to_hex(&oid_buf));
985 die("git upload-pack: not our ref %s",
986 oid_to_hex(&oid_buf));
988 if (!(o->flags & WANTED)) {
990 if (!((allow_unadvertised_object_request & ALLOW_ANY_SHA1) == ALLOW_ANY_SHA1
993 add_object_array(o, NULL, &data->want_obj);
998 * We have sent all our refs already, and the other end
999 * should have chosen out of them. When we are operating
1000 * in the stateless RPC mode, however, their choice may
1001 * have been based on the set of older refs advertised
1002 * by another process that handled the initial request.
1005 check_non_tip(data);
1007 if (!use_sideband && daemon_mode)
1010 if (depth == 0 && !deepen_rev_list && shallows.nr == 0)
1013 if (send_shallow_list(&data->writer, depth, deepen_rev_list, deepen_since,
1014 &deepen_not, deepen_relative, &shallows,
1017 object_array_clear(&shallows);
1020 /* return non-zero if the ref is hidden, otherwise 0 */
1021 static int mark_our_ref(const char *refname, const char *refname_full,
1022 const struct object_id *oid)
1024 struct object *o = lookup_unknown_object(oid);
1026 if (ref_is_hidden(refname, refname_full)) {
1027 o->flags |= HIDDEN_REF;
1030 o->flags |= OUR_REF;
1034 static int check_ref(const char *refname_full, const struct object_id *oid,
1035 int flag, void *cb_data)
1037 const char *refname = strip_namespace(refname_full);
1039 mark_our_ref(refname, refname_full, oid);
1043 static void format_symref_info(struct strbuf *buf, struct string_list *symref)
1045 struct string_list_item *item;
1049 for_each_string_list_item(item, symref)
1050 strbuf_addf(buf, " symref=%s:%s", item->string, (char *)item->util);
1053 static int send_ref(const char *refname, const struct object_id *oid,
1054 int flag, void *cb_data)
1056 static const char *capabilities = "multi_ack thin-pack side-band"
1057 " side-band-64k ofs-delta shallow deepen-since deepen-not"
1058 " deepen-relative no-progress include-tag multi_ack_detailed";
1059 const char *refname_nons = strip_namespace(refname);
1060 struct object_id peeled;
1061 struct upload_pack_data *data = cb_data;
1063 if (mark_our_ref(refname_nons, refname, oid))
1067 struct strbuf symref_info = STRBUF_INIT;
1069 format_symref_info(&symref_info, &data->symref);
1070 packet_write_fmt(1, "%s %s%c%s%s%s%s%s%s agent=%s\n",
1071 oid_to_hex(oid), refname_nons,
1073 (allow_unadvertised_object_request & ALLOW_TIP_SHA1) ?
1074 " allow-tip-sha1-in-want" : "",
1075 (allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1) ?
1076 " allow-reachable-sha1-in-want" : "",
1077 stateless_rpc ? " no-done" : "",
1079 allow_filter ? " filter" : "",
1080 git_user_agent_sanitized());
1081 strbuf_release(&symref_info);
1083 packet_write_fmt(1, "%s %s\n", oid_to_hex(oid), refname_nons);
1085 capabilities = NULL;
1086 if (!peel_ref(refname, &peeled))
1087 packet_write_fmt(1, "%s %s^{}\n", oid_to_hex(&peeled), refname_nons);
1091 static int find_symref(const char *refname, const struct object_id *oid,
1092 int flag, void *cb_data)
1094 const char *symref_target;
1095 struct string_list_item *item;
1097 if ((flag & REF_ISSYMREF) == 0)
1099 symref_target = resolve_ref_unsafe(refname, 0, NULL, &flag);
1100 if (!symref_target || (flag & REF_ISSYMREF) == 0)
1101 die("'%s' is a symref but it is not?", refname);
1102 item = string_list_append(cb_data, strip_namespace(refname));
1103 item->util = xstrdup(strip_namespace(symref_target));
1107 static int upload_pack_config(const char *var, const char *value, void *unused)
1109 if (!strcmp("uploadpack.allowtipsha1inwant", var)) {
1110 if (git_config_bool(var, value))
1111 allow_unadvertised_object_request |= ALLOW_TIP_SHA1;
1113 allow_unadvertised_object_request &= ~ALLOW_TIP_SHA1;
1114 } else if (!strcmp("uploadpack.allowreachablesha1inwant", var)) {
1115 if (git_config_bool(var, value))
1116 allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1;
1118 allow_unadvertised_object_request &= ~ALLOW_REACHABLE_SHA1;
1119 } else if (!strcmp("uploadpack.allowanysha1inwant", var)) {
1120 if (git_config_bool(var, value))
1121 allow_unadvertised_object_request |= ALLOW_ANY_SHA1;
1123 allow_unadvertised_object_request &= ~ALLOW_ANY_SHA1;
1124 } else if (!strcmp("uploadpack.keepalive", var)) {
1125 keepalive = git_config_int(var, value);
1128 } else if (!strcmp("uploadpack.allowfilter", var)) {
1129 allow_filter = git_config_bool(var, value);
1130 } else if (!strcmp("uploadpack.allowrefinwant", var)) {
1131 allow_ref_in_want = git_config_bool(var, value);
1132 } else if (!strcmp("uploadpack.allowsidebandall", var)) {
1133 allow_sideband_all = git_config_bool(var, value);
1134 } else if (!strcmp("core.precomposeunicode", var)) {
1135 precomposed_unicode = git_config_bool(var, value);
1138 if (current_config_scope() != CONFIG_SCOPE_LOCAL &&
1139 current_config_scope() != CONFIG_SCOPE_WORKTREE) {
1140 if (!strcmp("uploadpack.packobjectshook", var))
1141 return git_config_string(&pack_objects_hook, var, value);
1144 return parse_hide_refs_config(var, value, "uploadpack");
1147 void upload_pack(struct upload_pack_options *options)
1149 struct packet_reader reader;
1150 struct upload_pack_data data;
1152 stateless_rpc = options->stateless_rpc;
1153 timeout = options->timeout;
1154 daemon_mode = options->daemon_mode;
1156 git_config(upload_pack_config, NULL);
1158 upload_pack_data_init(&data);
1160 head_ref_namespaced(find_symref, &data.symref);
1162 if (options->advertise_refs || !stateless_rpc) {
1164 head_ref_namespaced(send_ref, &data);
1165 for_each_namespaced_ref(send_ref, &data);
1166 advertise_shallow_grafts(1);
1169 head_ref_namespaced(check_ref, NULL);
1170 for_each_namespaced_ref(check_ref, NULL);
1173 if (!options->advertise_refs) {
1174 packet_reader_init(&reader, 0, NULL, 0,
1175 PACKET_READ_CHOMP_NEWLINE |
1176 PACKET_READ_DIE_ON_ERR_PACKET);
1178 receive_needs(&data, &reader);
1179 if (data.want_obj.nr) {
1180 get_common_commits(&data, &reader);
1181 create_pack_file(&data.have_obj,
1183 &data.filter_options);
1187 upload_pack_data_clear(&data);
1190 static int parse_want(struct packet_writer *writer, const char *line,
1191 struct object_array *want_obj)
1194 if (skip_prefix(line, "want ", &arg)) {
1195 struct object_id oid;
1198 if (get_oid_hex(arg, &oid))
1199 die("git upload-pack: protocol error, "
1200 "expected to get oid, not '%s'", line);
1202 o = parse_object(the_repository, &oid);
1204 packet_writer_error(writer,
1205 "upload-pack: not our ref %s",
1207 die("git upload-pack: not our ref %s",
1211 if (!(o->flags & WANTED)) {
1213 add_object_array(o, NULL, want_obj);
1222 static int parse_want_ref(struct packet_writer *writer, const char *line,
1223 struct string_list *wanted_refs,
1224 struct object_array *want_obj)
1227 if (skip_prefix(line, "want-ref ", &arg)) {
1228 struct object_id oid;
1229 struct string_list_item *item;
1232 if (read_ref(arg, &oid)) {
1233 packet_writer_error(writer, "unknown ref %s", arg);
1234 die("unknown ref %s", arg);
1237 item = string_list_append(wanted_refs, arg);
1238 item->util = oiddup(&oid);
1240 o = parse_object_or_die(&oid, arg);
1241 if (!(o->flags & WANTED)) {
1243 add_object_array(o, NULL, want_obj);
1252 static int parse_have(const char *line, struct oid_array *haves)
1255 if (skip_prefix(line, "have ", &arg)) {
1256 struct object_id oid;
1258 if (get_oid_hex(arg, &oid))
1259 die("git upload-pack: expected SHA1 object, got '%s'", arg);
1260 oid_array_append(haves, &oid);
1267 static void process_args(struct packet_reader *request,
1268 struct upload_pack_data *data)
1270 while (packet_reader_read(request) == PACKET_READ_NORMAL) {
1271 const char *arg = request->line;
1275 if (parse_want(&data->writer, arg, &data->want_obj))
1277 if (allow_ref_in_want &&
1278 parse_want_ref(&data->writer, arg, &data->wanted_refs,
1281 /* process have line */
1282 if (parse_have(arg, &data->haves))
1285 /* process args like thin-pack */
1286 if (!strcmp(arg, "thin-pack")) {
1290 if (!strcmp(arg, "ofs-delta")) {
1294 if (!strcmp(arg, "no-progress")) {
1298 if (!strcmp(arg, "include-tag")) {
1299 use_include_tag = 1;
1302 if (!strcmp(arg, "done")) {
1307 /* Shallow related arguments */
1308 if (process_shallow(arg, &data->shallows))
1310 if (process_deepen(arg, &data->depth))
1312 if (process_deepen_since(arg, &data->deepen_since,
1313 &data->deepen_rev_list))
1315 if (process_deepen_not(arg, &data->deepen_not,
1316 &data->deepen_rev_list))
1318 if (!strcmp(arg, "deepen-relative")) {
1319 data->deepen_relative = 1;
1323 if (allow_filter && skip_prefix(arg, "filter ", &p)) {
1324 list_objects_filter_die_if_populated(&data->filter_options);
1325 parse_list_objects_filter(&data->filter_options, p);
1329 if ((git_env_bool("GIT_TEST_SIDEBAND_ALL", 0) ||
1330 allow_sideband_all) &&
1331 !strcmp(arg, "sideband-all")) {
1332 data->writer.use_sideband = 1;
1336 /* ignore unknown lines maybe? */
1337 die("unexpected line: '%s'", arg);
1340 if (request->status != PACKET_READ_FLUSH)
1341 die(_("expected flush after fetch arguments"));
1344 static int process_haves(struct oid_array *haves, struct oid_array *common,
1345 struct object_array *have_obj)
1350 for (i = 0; i < haves->nr; i++) {
1351 const struct object_id *oid = &haves->oid[i];
1353 int we_knew_they_have = 0;
1355 if (!has_object_file(oid))
1358 oid_array_append(common, oid);
1360 o = parse_object(the_repository, oid);
1362 die("oops (%s)", oid_to_hex(oid));
1363 if (o->type == OBJ_COMMIT) {
1364 struct commit_list *parents;
1365 struct commit *commit = (struct commit *)o;
1366 if (o->flags & THEY_HAVE)
1367 we_knew_they_have = 1;
1369 o->flags |= THEY_HAVE;
1370 if (!oldest_have || (commit->date < oldest_have))
1371 oldest_have = commit->date;
1372 for (parents = commit->parents;
1374 parents = parents->next)
1375 parents->item->object.flags |= THEY_HAVE;
1377 if (!we_knew_they_have)
1378 add_object_array(o, NULL, have_obj);
1384 static int send_acks(struct packet_writer *writer, struct oid_array *acks,
1385 const struct object_array *have_obj,
1386 struct object_array *want_obj)
1390 packet_writer_write(writer, "acknowledgments\n");
1394 packet_writer_write(writer, "NAK\n");
1396 for (i = 0; i < acks->nr; i++) {
1397 packet_writer_write(writer, "ACK %s\n",
1398 oid_to_hex(&acks->oid[i]));
1401 if (ok_to_give_up(have_obj, want_obj)) {
1403 packet_writer_write(writer, "ready\n");
1410 static int process_haves_and_send_acks(struct upload_pack_data *data)
1412 struct oid_array common = OID_ARRAY_INIT;
1415 process_haves(&data->haves, &common, &data->have_obj);
1418 } else if (send_acks(&data->writer, &common,
1419 &data->have_obj, &data->want_obj)) {
1420 packet_writer_delim(&data->writer);
1424 packet_writer_flush(&data->writer);
1428 oid_array_clear(&data->haves);
1429 oid_array_clear(&common);
1433 static void send_wanted_ref_info(struct upload_pack_data *data)
1435 const struct string_list_item *item;
1437 if (!data->wanted_refs.nr)
1440 packet_writer_write(&data->writer, "wanted-refs\n");
1442 for_each_string_list_item(item, &data->wanted_refs) {
1443 packet_writer_write(&data->writer, "%s %s\n",
1444 oid_to_hex(item->util),
1448 packet_writer_delim(&data->writer);
1451 static void send_shallow_info(struct upload_pack_data *data)
1453 /* No shallow info needs to be sent */
1454 if (!data->depth && !data->deepen_rev_list && !data->shallows.nr &&
1455 !is_repository_shallow(the_repository))
1458 packet_writer_write(&data->writer, "shallow-info\n");
1460 if (!send_shallow_list(&data->writer, data->depth,
1461 data->deepen_rev_list,
1462 data->deepen_since, &data->deepen_not,
1463 data->deepen_relative,
1464 &data->shallows, &data->want_obj) &&
1465 is_repository_shallow(the_repository))
1466 deepen(&data->writer, INFINITE_DEPTH, data->deepen_relative,
1467 &data->shallows, &data->want_obj);
1473 FETCH_PROCESS_ARGS = 0,
1479 int upload_pack_v2(struct repository *r, struct argv_array *keys,
1480 struct packet_reader *request)
1482 enum fetch_state state = FETCH_PROCESS_ARGS;
1483 struct upload_pack_data data;
1485 clear_object_flags(ALL_FLAGS);
1487 git_config(upload_pack_config, NULL);
1489 upload_pack_data_init(&data);
1490 use_sideband = LARGE_PACKET_MAX;
1492 while (state != FETCH_DONE) {
1494 case FETCH_PROCESS_ARGS:
1495 process_args(request, &data);
1497 if (!data.want_obj.nr) {
1499 * Request didn't contain any 'want' lines,
1500 * guess they didn't want anything.
1503 } else if (data.haves.nr) {
1505 * Request had 'have' lines, so lets ACK them.
1507 state = FETCH_SEND_ACKS;
1510 * Request had 'want's but no 'have's so we can
1511 * immedietly go to construct and send a pack.
1513 state = FETCH_SEND_PACK;
1516 case FETCH_SEND_ACKS:
1517 if (process_haves_and_send_acks(&data))
1518 state = FETCH_SEND_PACK;
1522 case FETCH_SEND_PACK:
1523 send_wanted_ref_info(&data);
1524 send_shallow_info(&data);
1526 packet_writer_write(&data.writer, "packfile\n");
1527 create_pack_file(&data.have_obj,
1529 &data.filter_options);
1537 upload_pack_data_clear(&data);
1541 int upload_pack_advertise(struct repository *r,
1542 struct strbuf *value)
1545 int allow_filter_value;
1546 int allow_ref_in_want;
1547 int allow_sideband_all_value;
1549 strbuf_addstr(value, "shallow");
1551 if (!repo_config_get_bool(the_repository,
1552 "uploadpack.allowfilter",
1553 &allow_filter_value) &&
1555 strbuf_addstr(value, " filter");
1557 if (!repo_config_get_bool(the_repository,
1558 "uploadpack.allowrefinwant",
1559 &allow_ref_in_want) &&
1561 strbuf_addstr(value, " ref-in-want");
1563 if (git_env_bool("GIT_TEST_SIDEBAND_ALL", 0) ||
1564 (!repo_config_get_bool(the_repository,
1565 "uploadpack.allowsidebandall",
1566 &allow_sideband_all_value) &&
1567 allow_sideband_all_value))
1568 strbuf_addstr(value, " sideband-all");