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 const char *pack_objects_hook;
68 static int filter_capability_requested;
69 static int allow_filter;
70 static int allow_ref_in_want;
72 static int allow_sideband_all;
74 struct upload_pack_data {
75 struct string_list symref;
76 struct string_list wanted_refs;
77 struct object_array want_obj;
78 struct object_array have_obj;
79 struct oid_array haves;
81 struct object_array shallows;
82 struct string_list deepen_not;
84 timestamp_t deepen_since;
88 struct list_objects_filter_options filter_options;
90 struct packet_writer writer;
92 unsigned stateless_rpc : 1;
94 unsigned use_thin_pack : 1;
95 unsigned use_ofs_delta : 1;
96 unsigned no_progress : 1;
97 unsigned use_include_tag : 1;
101 static void upload_pack_data_init(struct upload_pack_data *data)
103 struct string_list symref = STRING_LIST_INIT_DUP;
104 struct string_list wanted_refs = STRING_LIST_INIT_DUP;
105 struct object_array want_obj = OBJECT_ARRAY_INIT;
106 struct object_array have_obj = OBJECT_ARRAY_INIT;
107 struct oid_array haves = OID_ARRAY_INIT;
108 struct object_array shallows = OBJECT_ARRAY_INIT;
109 struct string_list deepen_not = STRING_LIST_INIT_DUP;
111 memset(data, 0, sizeof(*data));
112 data->symref = symref;
113 data->wanted_refs = wanted_refs;
114 data->want_obj = want_obj;
115 data->have_obj = have_obj;
117 data->shallows = shallows;
118 data->deepen_not = deepen_not;
119 packet_writer_init(&data->writer, 1);
122 static void upload_pack_data_clear(struct upload_pack_data *data)
124 string_list_clear(&data->symref, 1);
125 string_list_clear(&data->wanted_refs, 1);
126 object_array_clear(&data->want_obj);
127 object_array_clear(&data->have_obj);
128 oid_array_clear(&data->haves);
129 object_array_clear(&data->shallows);
130 string_list_clear(&data->deepen_not, 0);
131 list_objects_filter_release(&data->filter_options);
134 static void reset_timeout(void)
139 static void send_client_data(int fd, const char *data, ssize_t sz)
142 send_sideband(1, fd, data, sz, use_sideband);
149 /* XXX: are we happy to lose stuff here? */
150 xwrite(fd, data, sz);
153 write_or_die(fd, data, sz);
156 static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
159 if (graft->nr_parent == -1)
160 fprintf(fp, "--shallow %s\n", oid_to_hex(&graft->oid));
164 static void create_pack_file(struct upload_pack_data *pack_data)
166 struct child_process pack_objects = CHILD_PROCESS_INIT;
167 char data[8193], progress[128];
168 char abort_msg[] = "aborting due to possible repository "
169 "corruption on the remote side.";
175 if (!pack_objects_hook)
176 pack_objects.git_cmd = 1;
178 argv_array_push(&pack_objects.args, pack_objects_hook);
179 argv_array_push(&pack_objects.args, "git");
180 pack_objects.use_shell = 1;
184 argv_array_push(&pack_objects.args, "--shallow-file");
185 argv_array_push(&pack_objects.args, "");
187 argv_array_push(&pack_objects.args, "pack-objects");
188 argv_array_push(&pack_objects.args, "--revs");
190 argv_array_push(&pack_objects.args, "--thin");
192 argv_array_push(&pack_objects.args, "--stdout");
194 argv_array_push(&pack_objects.args, "--shallow");
196 argv_array_push(&pack_objects.args, "--progress");
198 argv_array_push(&pack_objects.args, "--delta-base-offset");
200 argv_array_push(&pack_objects.args, "--include-tag");
201 if (pack_data->filter_options.choice) {
203 expand_list_objects_filter_spec(&pack_data->filter_options);
204 if (pack_objects.use_shell) {
205 struct strbuf buf = STRBUF_INIT;
206 sq_quote_buf(&buf, spec);
207 argv_array_pushf(&pack_objects.args, "--filter=%s", buf.buf);
208 strbuf_release(&buf);
210 argv_array_pushf(&pack_objects.args, "--filter=%s",
215 pack_objects.in = -1;
216 pack_objects.out = -1;
217 pack_objects.err = -1;
219 if (start_command(&pack_objects))
220 die("git upload-pack: unable to fork git-pack-objects");
222 pipe_fd = xfdopen(pack_objects.in, "w");
225 for_each_commit_graft(write_one_shallow, pipe_fd);
227 for (i = 0; i < pack_data->want_obj.nr; i++)
228 fprintf(pipe_fd, "%s\n",
229 oid_to_hex(&pack_data->want_obj.objects[i].item->oid));
230 fprintf(pipe_fd, "--not\n");
231 for (i = 0; i < pack_data->have_obj.nr; i++)
232 fprintf(pipe_fd, "%s\n",
233 oid_to_hex(&pack_data->have_obj.objects[i].item->oid));
234 for (i = 0; i < extra_edge_obj.nr; i++)
235 fprintf(pipe_fd, "%s\n",
236 oid_to_hex(&extra_edge_obj.objects[i].item->oid));
237 fprintf(pipe_fd, "\n");
241 /* We read from pack_objects.err to capture stderr output for
242 * progress bar, and pack_objects.out to capture the pack data.
246 struct pollfd pfd[2];
247 int pe, pu, pollsize;
255 if (0 <= pack_objects.out) {
256 pfd[pollsize].fd = pack_objects.out;
257 pfd[pollsize].events = POLLIN;
261 if (0 <= pack_objects.err) {
262 pfd[pollsize].fd = pack_objects.err;
263 pfd[pollsize].events = POLLIN;
271 ret = poll(pfd, pollsize,
272 keepalive < 0 ? -1 : 1000 * keepalive);
275 if (errno != EINTR) {
276 error_errno("poll failed, resuming");
281 if (0 <= pe && (pfd[pe].revents & (POLLIN|POLLHUP))) {
282 /* Status ready; we ship that in the side-band
283 * or dump to the standard error.
285 sz = xread(pack_objects.err, progress,
288 send_client_data(2, progress, sz);
290 close(pack_objects.err);
291 pack_objects.err = -1;
295 /* give priority to status messages */
298 if (0 <= pu && (pfd[pu].revents & (POLLIN|POLLHUP))) {
299 /* Data ready; we keep the last byte to ourselves
300 * in case we detect broken rev-list, so that we
301 * can leave the stream corrupted. This is
302 * unfortunate -- unpack-objects would happily
303 * accept a valid packdata with trailing garbage,
304 * so appending garbage after we pass all the
305 * pack data is not good enough to signal
306 * breakage to downstream.
314 sz = xread(pack_objects.out, cp,
315 sizeof(data) - outsz);
319 close(pack_objects.out);
320 pack_objects.out = -1;
326 buffered = data[sz-1] & 0xFF;
331 send_client_data(1, data, sz);
335 * We hit the keepalive timeout without saying anything; send
336 * an empty message on the data sideband just to let the other
337 * side know we're still working on it, but don't have any data
340 * If we don't have a sideband channel, there's no room in the
341 * protocol to say anything, so those clients are just out of
344 if (!ret && use_sideband) {
345 static const char buf[] = "0005\1";
346 write_or_die(1, buf, 5);
350 if (finish_command(&pack_objects)) {
351 error("git upload-pack: git-pack-objects died with error.");
358 send_client_data(1, data, 1);
359 fprintf(stderr, "flushed.\n");
366 send_client_data(3, abort_msg, sizeof(abort_msg));
367 die("git upload-pack: %s", abort_msg);
370 static int got_oid(const char *hex, struct object_id *oid,
371 struct object_array *have_obj)
374 int we_knew_they_have = 0;
376 if (get_oid_hex(hex, oid))
377 die("git upload-pack: expected SHA1 object, got '%s'", hex);
378 if (!has_object_file(oid))
381 o = parse_object(the_repository, oid);
383 die("oops (%s)", oid_to_hex(oid));
384 if (o->type == OBJ_COMMIT) {
385 struct commit_list *parents;
386 struct commit *commit = (struct commit *)o;
387 if (o->flags & THEY_HAVE)
388 we_knew_they_have = 1;
390 o->flags |= THEY_HAVE;
391 if (!oldest_have || (commit->date < oldest_have))
392 oldest_have = commit->date;
393 for (parents = commit->parents;
395 parents = parents->next)
396 parents->item->object.flags |= THEY_HAVE;
398 if (!we_knew_they_have) {
399 add_object_array(o, NULL, have_obj);
405 static int ok_to_give_up(const struct object_array *have_obj,
406 struct object_array *want_obj)
408 uint32_t min_generation = GENERATION_NUMBER_ZERO;
413 return can_all_from_reach_with_flag(want_obj, THEY_HAVE,
414 COMMON_KNOWN, oldest_have,
418 static int get_common_commits(struct upload_pack_data *data,
419 struct packet_reader *reader)
421 struct object_id oid;
422 char last_hex[GIT_MAX_HEXSZ + 1];
427 save_commit_buffer = 0;
434 if (packet_reader_read(reader) != PACKET_READ_NORMAL) {
438 && ok_to_give_up(&data->have_obj, &data->want_obj)) {
440 packet_write_fmt(1, "ACK %s ready\n", last_hex);
442 if (data->have_obj.nr == 0 || multi_ack)
443 packet_write_fmt(1, "NAK\n");
445 if (no_done && sent_ready) {
446 packet_write_fmt(1, "ACK %s\n", last_hex);
449 if (data->stateless_rpc)
455 if (skip_prefix(reader->line, "have ", &arg)) {
456 switch (got_oid(arg, &oid, &data->have_obj)) {
457 case -1: /* they have what we do not */
460 && ok_to_give_up(&data->have_obj, &data->want_obj)) {
461 const char *hex = oid_to_hex(&oid);
462 if (multi_ack == 2) {
464 packet_write_fmt(1, "ACK %s ready\n", hex);
466 packet_write_fmt(1, "ACK %s continue\n", hex);
471 oid_to_hex_r(last_hex, &oid);
473 packet_write_fmt(1, "ACK %s common\n", last_hex);
475 packet_write_fmt(1, "ACK %s continue\n", last_hex);
476 else if (data->have_obj.nr == 1)
477 packet_write_fmt(1, "ACK %s\n", last_hex);
482 if (!strcmp(reader->line, "done")) {
483 if (data->have_obj.nr > 0) {
485 packet_write_fmt(1, "ACK %s\n", last_hex);
488 packet_write_fmt(1, "NAK\n");
491 die("git upload-pack: expected SHA1 list, got '%s'", reader->line);
495 static int is_our_ref(struct object *o)
497 int allow_hidden_ref = (allow_unadvertised_object_request &
498 (ALLOW_TIP_SHA1 | ALLOW_REACHABLE_SHA1));
499 return o->flags & ((allow_hidden_ref ? HIDDEN_REF : 0) | OUR_REF);
503 * on successful case, it's up to the caller to close cmd->out
505 static int do_reachable_revlist(struct child_process *cmd,
506 struct object_array *src,
507 struct object_array *reachable)
509 static const char *argv[] = {
510 "rev-list", "--stdin", NULL,
513 char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */
515 const unsigned hexsz = the_hash_algo->hexsz;
524 * If the next rev-list --stdin encounters an unknown commit,
525 * it terminates, which will cause SIGPIPE in the write loop
528 sigchain_push(SIGPIPE, SIG_IGN);
530 if (start_command(cmd))
534 namebuf[hexsz + 1] = '\n';
535 for (i = get_max_object_index(); 0 < i; ) {
536 o = get_indexed_object(--i);
539 if (reachable && o->type == OBJ_COMMIT)
540 o->flags &= ~TMP_MARK;
543 memcpy(namebuf + 1, oid_to_hex(&o->oid), hexsz);
544 if (write_in_full(cmd->in, namebuf, hexsz + 2) < 0)
547 namebuf[hexsz] = '\n';
548 for (i = 0; i < src->nr; i++) {
549 o = src->objects[i].item;
552 add_object_array(o, NULL, reachable);
555 if (reachable && o->type == OBJ_COMMIT)
556 o->flags |= TMP_MARK;
557 memcpy(namebuf, oid_to_hex(&o->oid), hexsz);
558 if (write_in_full(cmd->in, namebuf, hexsz + 1) < 0)
563 sigchain_pop(SIGPIPE);
568 sigchain_pop(SIGPIPE);
577 static int get_reachable_list(struct object_array *src,
578 struct object_array *reachable)
580 struct child_process cmd = CHILD_PROCESS_INIT;
583 char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */
584 const unsigned hexsz = the_hash_algo->hexsz;
586 if (do_reachable_revlist(&cmd, src, reachable) < 0)
589 while ((i = read_in_full(cmd.out, namebuf, hexsz + 1)) == hexsz + 1) {
590 struct object_id oid;
593 if (parse_oid_hex(namebuf, &oid, &p) || *p != '\n')
596 o = lookup_object(the_repository, &oid);
597 if (o && o->type == OBJ_COMMIT) {
598 o->flags &= ~TMP_MARK;
601 for (i = get_max_object_index(); 0 < i; i--) {
602 o = get_indexed_object(i - 1);
603 if (o && o->type == OBJ_COMMIT &&
604 (o->flags & TMP_MARK)) {
605 add_object_array(o, NULL, reachable);
606 o->flags &= ~TMP_MARK;
611 if (finish_command(&cmd))
617 static int has_unreachable(struct object_array *src)
619 struct child_process cmd = CHILD_PROCESS_INIT;
623 if (do_reachable_revlist(&cmd, src, NULL) < 0)
627 * The commits out of the rev-list are not ancestors of
630 i = read_in_full(cmd.out, buf, 1);
637 * rev-list may have died by encountering a bad commit
638 * in the history, in which case we do want to bail out
639 * even when it showed no commit.
641 if (finish_command(&cmd))
644 /* All the non-tip ones are ancestors of what we advertised */
648 sigchain_pop(SIGPIPE);
654 static void check_non_tip(struct upload_pack_data *data)
659 * In the normal in-process case without
660 * uploadpack.allowReachableSHA1InWant,
661 * non-tip requests can never happen.
663 if (!data->stateless_rpc
664 && !(allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1))
666 if (!has_unreachable(&data->want_obj))
667 /* All the non-tip ones are ancestors of what we advertised */
671 /* Pick one of them (we know there at least is one) */
672 for (i = 0; i < data->want_obj.nr; i++) {
673 struct object *o = data->want_obj.objects[i].item;
674 if (!is_our_ref(o)) {
675 packet_writer_error(&data->writer,
676 "upload-pack: not our ref %s",
677 oid_to_hex(&o->oid));
678 die("git upload-pack: not our ref %s",
679 oid_to_hex(&o->oid));
684 static void send_shallow(struct packet_writer *writer,
685 struct commit_list *result)
688 struct object *object = &result->item->object;
689 if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) {
690 packet_writer_write(writer, "shallow %s",
691 oid_to_hex(&object->oid));
692 register_shallow(the_repository, &object->oid);
695 result = result->next;
699 static void send_unshallow(struct packet_writer *writer,
700 const struct object_array *shallows,
701 struct object_array *want_obj)
705 for (i = 0; i < shallows->nr; i++) {
706 struct object *object = shallows->objects[i].item;
707 if (object->flags & NOT_SHALLOW) {
708 struct commit_list *parents;
709 packet_writer_write(writer, "unshallow %s",
710 oid_to_hex(&object->oid));
711 object->flags &= ~CLIENT_SHALLOW;
713 * We want to _register_ "object" as shallow, but we
714 * also need to traverse object's parents to deepen a
715 * shallow clone. Unregister it for now so we can
716 * parse and add the parents to the want list, then
719 unregister_shallow(&object->oid);
721 parse_commit_or_die((struct commit *)object);
722 parents = ((struct commit *)object)->parents;
724 add_object_array(&parents->item->object,
726 parents = parents->next;
728 add_object_array(object, NULL, &extra_edge_obj);
730 /* make sure commit traversal conforms to client */
731 register_shallow(the_repository, &object->oid);
735 static int check_ref(const char *refname_full, const struct object_id *oid,
736 int flag, void *cb_data);
737 static void deepen(struct packet_writer *writer, int depth, int deepen_relative,
738 struct object_array *shallows, struct object_array *want_obj)
740 if (depth == INFINITE_DEPTH && !is_repository_shallow(the_repository)) {
743 for (i = 0; i < shallows->nr; i++) {
744 struct object *object = shallows->objects[i].item;
745 object->flags |= NOT_SHALLOW;
747 } else if (deepen_relative) {
748 struct object_array reachable_shallows = OBJECT_ARRAY_INIT;
749 struct commit_list *result;
752 * Checking for reachable shallows requires that our refs be
753 * marked with OUR_REF.
755 head_ref_namespaced(check_ref, NULL);
756 for_each_namespaced_ref(check_ref, NULL);
758 get_reachable_list(shallows, &reachable_shallows);
759 result = get_shallow_commits(&reachable_shallows,
761 SHALLOW, NOT_SHALLOW);
762 send_shallow(writer, result);
763 free_commit_list(result);
764 object_array_clear(&reachable_shallows);
766 struct commit_list *result;
768 result = get_shallow_commits(want_obj, depth,
769 SHALLOW, NOT_SHALLOW);
770 send_shallow(writer, result);
771 free_commit_list(result);
774 send_unshallow(writer, shallows, want_obj);
777 static void deepen_by_rev_list(struct packet_writer *writer, int ac,
779 struct object_array *shallows,
780 struct object_array *want_obj)
782 struct commit_list *result;
784 disable_commit_graph(the_repository);
785 result = get_shallow_commits_by_rev_list(ac, av, SHALLOW, NOT_SHALLOW);
786 send_shallow(writer, result);
787 free_commit_list(result);
788 send_unshallow(writer, shallows, want_obj);
791 /* Returns 1 if a shallow list is sent or 0 otherwise */
792 static int send_shallow_list(struct packet_writer *writer,
793 int depth, int deepen_rev_list,
794 timestamp_t deepen_since,
795 struct string_list *deepen_not,
797 struct object_array *shallows,
798 struct object_array *want_obj)
802 if (depth > 0 && deepen_rev_list)
803 die("git upload-pack: deepen and deepen-since (or deepen-not) cannot be used together");
805 deepen(writer, depth, deepen_relative, shallows, want_obj);
807 } else if (deepen_rev_list) {
808 struct argv_array av = ARGV_ARRAY_INIT;
811 argv_array_push(&av, "rev-list");
813 argv_array_pushf(&av, "--max-age=%"PRItime, deepen_since);
814 if (deepen_not->nr) {
815 argv_array_push(&av, "--not");
816 for (i = 0; i < deepen_not->nr; i++) {
817 struct string_list_item *s = deepen_not->items + i;
818 argv_array_push(&av, s->string);
820 argv_array_push(&av, "--not");
822 for (i = 0; i < want_obj->nr; i++) {
823 struct object *o = want_obj->objects[i].item;
824 argv_array_push(&av, oid_to_hex(&o->oid));
826 deepen_by_rev_list(writer, av.argc, av.argv, shallows, want_obj);
827 argv_array_clear(&av);
830 if (shallows->nr > 0) {
832 for (i = 0; i < shallows->nr; i++)
833 register_shallow(the_repository,
834 &shallows->objects[i].item->oid);
838 shallow_nr += shallows->nr;
842 static int process_shallow(const char *line, struct object_array *shallows)
845 if (skip_prefix(line, "shallow ", &arg)) {
846 struct object_id oid;
847 struct object *object;
848 if (get_oid_hex(arg, &oid))
849 die("invalid shallow line: %s", line);
850 object = parse_object(the_repository, &oid);
853 if (object->type != OBJ_COMMIT)
854 die("invalid shallow object %s", oid_to_hex(&oid));
855 if (!(object->flags & CLIENT_SHALLOW)) {
856 object->flags |= CLIENT_SHALLOW;
857 add_object_array(object, NULL, shallows);
865 static int process_deepen(const char *line, int *depth)
868 if (skip_prefix(line, "deepen ", &arg)) {
870 *depth = (int)strtol(arg, &end, 0);
871 if (!end || *end || *depth <= 0)
872 die("Invalid deepen: %s", line);
879 static int process_deepen_since(const char *line, timestamp_t *deepen_since, int *deepen_rev_list)
882 if (skip_prefix(line, "deepen-since ", &arg)) {
884 *deepen_since = parse_timestamp(arg, &end, 0);
885 if (!end || *end || !deepen_since ||
886 /* revisions.c's max_age -1 is special */
888 die("Invalid deepen-since: %s", line);
889 *deepen_rev_list = 1;
895 static int process_deepen_not(const char *line, struct string_list *deepen_not, int *deepen_rev_list)
898 if (skip_prefix(line, "deepen-not ", &arg)) {
900 struct object_id oid;
901 if (expand_ref(the_repository, arg, strlen(arg), &oid, &ref) != 1)
902 die("git upload-pack: ambiguous deepen-not: %s", line);
903 string_list_append(deepen_not, ref);
905 *deepen_rev_list = 1;
911 static void receive_needs(struct upload_pack_data *data,
912 struct packet_reader *reader)
919 const char *features;
920 struct object_id oid_buf;
924 if (packet_reader_read(reader) != PACKET_READ_NORMAL)
927 if (process_shallow(reader->line, &data->shallows))
929 if (process_deepen(reader->line, &data->depth))
931 if (process_deepen_since(reader->line, &data->deepen_since, &data->deepen_rev_list))
933 if (process_deepen_not(reader->line, &data->deepen_not, &data->deepen_rev_list))
936 if (skip_prefix(reader->line, "filter ", &arg)) {
937 if (!filter_capability_requested)
938 die("git upload-pack: filtering capability not negotiated");
939 list_objects_filter_die_if_populated(&data->filter_options);
940 parse_list_objects_filter(&data->filter_options, arg);
944 if (!skip_prefix(reader->line, "want ", &arg) ||
945 parse_oid_hex(arg, &oid_buf, &features))
946 die("git upload-pack: protocol error, "
947 "expected to get object ID, not '%s'", reader->line);
949 if (parse_feature_request(features, "deepen-relative"))
950 data->deepen_relative = 1;
951 if (parse_feature_request(features, "multi_ack_detailed"))
953 else if (parse_feature_request(features, "multi_ack"))
955 if (parse_feature_request(features, "no-done"))
957 if (parse_feature_request(features, "thin-pack"))
959 if (parse_feature_request(features, "ofs-delta"))
961 if (parse_feature_request(features, "side-band-64k"))
962 use_sideband = LARGE_PACKET_MAX;
963 else if (parse_feature_request(features, "side-band"))
964 use_sideband = DEFAULT_PACKET_MAX;
965 if (parse_feature_request(features, "no-progress"))
967 if (parse_feature_request(features, "include-tag"))
969 if (allow_filter && parse_feature_request(features, "filter"))
970 filter_capability_requested = 1;
972 o = parse_object(the_repository, &oid_buf);
974 packet_writer_error(&data->writer,
975 "upload-pack: not our ref %s",
976 oid_to_hex(&oid_buf));
977 die("git upload-pack: not our ref %s",
978 oid_to_hex(&oid_buf));
980 if (!(o->flags & WANTED)) {
982 if (!((allow_unadvertised_object_request & ALLOW_ANY_SHA1) == ALLOW_ANY_SHA1
985 add_object_array(o, NULL, &data->want_obj);
990 * We have sent all our refs already, and the other end
991 * should have chosen out of them. When we are operating
992 * in the stateless RPC mode, however, their choice may
993 * have been based on the set of older refs advertised
994 * by another process that handled the initial request.
999 if (!use_sideband && daemon_mode)
1002 if (data->depth == 0 && !data->deepen_rev_list && data->shallows.nr == 0)
1005 if (send_shallow_list(&data->writer,
1007 data->deepen_rev_list,
1010 data->deepen_relative,
1016 /* return non-zero if the ref is hidden, otherwise 0 */
1017 static int mark_our_ref(const char *refname, const char *refname_full,
1018 const struct object_id *oid)
1020 struct object *o = lookup_unknown_object(oid);
1022 if (ref_is_hidden(refname, refname_full)) {
1023 o->flags |= HIDDEN_REF;
1026 o->flags |= OUR_REF;
1030 static int check_ref(const char *refname_full, const struct object_id *oid,
1031 int flag, void *cb_data)
1033 const char *refname = strip_namespace(refname_full);
1035 mark_our_ref(refname, refname_full, oid);
1039 static void format_symref_info(struct strbuf *buf, struct string_list *symref)
1041 struct string_list_item *item;
1045 for_each_string_list_item(item, symref)
1046 strbuf_addf(buf, " symref=%s:%s", item->string, (char *)item->util);
1049 static int send_ref(const char *refname, const struct object_id *oid,
1050 int flag, void *cb_data)
1052 static const char *capabilities = "multi_ack thin-pack side-band"
1053 " side-band-64k ofs-delta shallow deepen-since deepen-not"
1054 " deepen-relative no-progress include-tag multi_ack_detailed";
1055 const char *refname_nons = strip_namespace(refname);
1056 struct object_id peeled;
1057 struct upload_pack_data *data = cb_data;
1059 if (mark_our_ref(refname_nons, refname, oid))
1063 struct strbuf symref_info = STRBUF_INIT;
1065 format_symref_info(&symref_info, &data->symref);
1066 packet_write_fmt(1, "%s %s%c%s%s%s%s%s%s agent=%s\n",
1067 oid_to_hex(oid), refname_nons,
1069 (allow_unadvertised_object_request & ALLOW_TIP_SHA1) ?
1070 " allow-tip-sha1-in-want" : "",
1071 (allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1) ?
1072 " allow-reachable-sha1-in-want" : "",
1073 data->stateless_rpc ? " no-done" : "",
1075 allow_filter ? " filter" : "",
1076 git_user_agent_sanitized());
1077 strbuf_release(&symref_info);
1079 packet_write_fmt(1, "%s %s\n", oid_to_hex(oid), refname_nons);
1081 capabilities = NULL;
1082 if (!peel_ref(refname, &peeled))
1083 packet_write_fmt(1, "%s %s^{}\n", oid_to_hex(&peeled), refname_nons);
1087 static int find_symref(const char *refname, const struct object_id *oid,
1088 int flag, void *cb_data)
1090 const char *symref_target;
1091 struct string_list_item *item;
1093 if ((flag & REF_ISSYMREF) == 0)
1095 symref_target = resolve_ref_unsafe(refname, 0, NULL, &flag);
1096 if (!symref_target || (flag & REF_ISSYMREF) == 0)
1097 die("'%s' is a symref but it is not?", refname);
1098 item = string_list_append(cb_data, strip_namespace(refname));
1099 item->util = xstrdup(strip_namespace(symref_target));
1103 static int upload_pack_config(const char *var, const char *value, void *unused)
1105 if (!strcmp("uploadpack.allowtipsha1inwant", var)) {
1106 if (git_config_bool(var, value))
1107 allow_unadvertised_object_request |= ALLOW_TIP_SHA1;
1109 allow_unadvertised_object_request &= ~ALLOW_TIP_SHA1;
1110 } else if (!strcmp("uploadpack.allowreachablesha1inwant", var)) {
1111 if (git_config_bool(var, value))
1112 allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1;
1114 allow_unadvertised_object_request &= ~ALLOW_REACHABLE_SHA1;
1115 } else if (!strcmp("uploadpack.allowanysha1inwant", var)) {
1116 if (git_config_bool(var, value))
1117 allow_unadvertised_object_request |= ALLOW_ANY_SHA1;
1119 allow_unadvertised_object_request &= ~ALLOW_ANY_SHA1;
1120 } else if (!strcmp("uploadpack.keepalive", var)) {
1121 keepalive = git_config_int(var, value);
1124 } else if (!strcmp("uploadpack.allowfilter", var)) {
1125 allow_filter = git_config_bool(var, value);
1126 } else if (!strcmp("uploadpack.allowrefinwant", var)) {
1127 allow_ref_in_want = git_config_bool(var, value);
1128 } else if (!strcmp("uploadpack.allowsidebandall", var)) {
1129 allow_sideband_all = git_config_bool(var, value);
1130 } else if (!strcmp("core.precomposeunicode", var)) {
1131 precomposed_unicode = git_config_bool(var, value);
1134 if (current_config_scope() != CONFIG_SCOPE_LOCAL &&
1135 current_config_scope() != CONFIG_SCOPE_WORKTREE) {
1136 if (!strcmp("uploadpack.packobjectshook", var))
1137 return git_config_string(&pack_objects_hook, var, value);
1140 return parse_hide_refs_config(var, value, "uploadpack");
1143 void upload_pack(struct upload_pack_options *options)
1145 struct packet_reader reader;
1146 struct upload_pack_data data;
1148 timeout = options->timeout;
1149 daemon_mode = options->daemon_mode;
1151 git_config(upload_pack_config, NULL);
1153 upload_pack_data_init(&data);
1155 data.stateless_rpc = options->stateless_rpc;
1157 head_ref_namespaced(find_symref, &data.symref);
1159 if (options->advertise_refs || !data.stateless_rpc) {
1161 head_ref_namespaced(send_ref, &data);
1162 for_each_namespaced_ref(send_ref, &data);
1163 advertise_shallow_grafts(1);
1166 head_ref_namespaced(check_ref, NULL);
1167 for_each_namespaced_ref(check_ref, NULL);
1170 if (!options->advertise_refs) {
1171 packet_reader_init(&reader, 0, NULL, 0,
1172 PACKET_READ_CHOMP_NEWLINE |
1173 PACKET_READ_DIE_ON_ERR_PACKET);
1175 receive_needs(&data, &reader);
1176 if (data.want_obj.nr) {
1177 get_common_commits(&data, &reader);
1178 create_pack_file(&data);
1182 upload_pack_data_clear(&data);
1185 static int parse_want(struct packet_writer *writer, const char *line,
1186 struct object_array *want_obj)
1189 if (skip_prefix(line, "want ", &arg)) {
1190 struct object_id oid;
1193 if (get_oid_hex(arg, &oid))
1194 die("git upload-pack: protocol error, "
1195 "expected to get oid, not '%s'", line);
1197 o = parse_object(the_repository, &oid);
1199 packet_writer_error(writer,
1200 "upload-pack: not our ref %s",
1202 die("git upload-pack: not our ref %s",
1206 if (!(o->flags & WANTED)) {
1208 add_object_array(o, NULL, want_obj);
1217 static int parse_want_ref(struct packet_writer *writer, const char *line,
1218 struct string_list *wanted_refs,
1219 struct object_array *want_obj)
1222 if (skip_prefix(line, "want-ref ", &arg)) {
1223 struct object_id oid;
1224 struct string_list_item *item;
1227 if (read_ref(arg, &oid)) {
1228 packet_writer_error(writer, "unknown ref %s", arg);
1229 die("unknown ref %s", arg);
1232 item = string_list_append(wanted_refs, arg);
1233 item->util = oiddup(&oid);
1235 o = parse_object_or_die(&oid, arg);
1236 if (!(o->flags & WANTED)) {
1238 add_object_array(o, NULL, want_obj);
1247 static int parse_have(const char *line, struct oid_array *haves)
1250 if (skip_prefix(line, "have ", &arg)) {
1251 struct object_id oid;
1253 if (get_oid_hex(arg, &oid))
1254 die("git upload-pack: expected SHA1 object, got '%s'", arg);
1255 oid_array_append(haves, &oid);
1262 static void process_args(struct packet_reader *request,
1263 struct upload_pack_data *data)
1265 while (packet_reader_read(request) == PACKET_READ_NORMAL) {
1266 const char *arg = request->line;
1270 if (parse_want(&data->writer, arg, &data->want_obj))
1272 if (allow_ref_in_want &&
1273 parse_want_ref(&data->writer, arg, &data->wanted_refs,
1276 /* process have line */
1277 if (parse_have(arg, &data->haves))
1280 /* process args like thin-pack */
1281 if (!strcmp(arg, "thin-pack")) {
1285 if (!strcmp(arg, "ofs-delta")) {
1289 if (!strcmp(arg, "no-progress")) {
1293 if (!strcmp(arg, "include-tag")) {
1294 use_include_tag = 1;
1297 if (!strcmp(arg, "done")) {
1302 /* Shallow related arguments */
1303 if (process_shallow(arg, &data->shallows))
1305 if (process_deepen(arg, &data->depth))
1307 if (process_deepen_since(arg, &data->deepen_since,
1308 &data->deepen_rev_list))
1310 if (process_deepen_not(arg, &data->deepen_not,
1311 &data->deepen_rev_list))
1313 if (!strcmp(arg, "deepen-relative")) {
1314 data->deepen_relative = 1;
1318 if (allow_filter && skip_prefix(arg, "filter ", &p)) {
1319 list_objects_filter_die_if_populated(&data->filter_options);
1320 parse_list_objects_filter(&data->filter_options, p);
1324 if ((git_env_bool("GIT_TEST_SIDEBAND_ALL", 0) ||
1325 allow_sideband_all) &&
1326 !strcmp(arg, "sideband-all")) {
1327 data->writer.use_sideband = 1;
1331 /* ignore unknown lines maybe? */
1332 die("unexpected line: '%s'", arg);
1335 if (request->status != PACKET_READ_FLUSH)
1336 die(_("expected flush after fetch arguments"));
1339 static int process_haves(struct oid_array *haves, struct oid_array *common,
1340 struct object_array *have_obj)
1345 for (i = 0; i < haves->nr; i++) {
1346 const struct object_id *oid = &haves->oid[i];
1348 int we_knew_they_have = 0;
1350 if (!has_object_file(oid))
1353 oid_array_append(common, oid);
1355 o = parse_object(the_repository, oid);
1357 die("oops (%s)", oid_to_hex(oid));
1358 if (o->type == OBJ_COMMIT) {
1359 struct commit_list *parents;
1360 struct commit *commit = (struct commit *)o;
1361 if (o->flags & THEY_HAVE)
1362 we_knew_they_have = 1;
1364 o->flags |= THEY_HAVE;
1365 if (!oldest_have || (commit->date < oldest_have))
1366 oldest_have = commit->date;
1367 for (parents = commit->parents;
1369 parents = parents->next)
1370 parents->item->object.flags |= THEY_HAVE;
1372 if (!we_knew_they_have)
1373 add_object_array(o, NULL, have_obj);
1379 static int send_acks(struct packet_writer *writer, struct oid_array *acks,
1380 const struct object_array *have_obj,
1381 struct object_array *want_obj)
1385 packet_writer_write(writer, "acknowledgments\n");
1389 packet_writer_write(writer, "NAK\n");
1391 for (i = 0; i < acks->nr; i++) {
1392 packet_writer_write(writer, "ACK %s\n",
1393 oid_to_hex(&acks->oid[i]));
1396 if (ok_to_give_up(have_obj, want_obj)) {
1398 packet_writer_write(writer, "ready\n");
1405 static int process_haves_and_send_acks(struct upload_pack_data *data)
1407 struct oid_array common = OID_ARRAY_INIT;
1410 process_haves(&data->haves, &common, &data->have_obj);
1413 } else if (send_acks(&data->writer, &common,
1414 &data->have_obj, &data->want_obj)) {
1415 packet_writer_delim(&data->writer);
1419 packet_writer_flush(&data->writer);
1423 oid_array_clear(&data->haves);
1424 oid_array_clear(&common);
1428 static void send_wanted_ref_info(struct upload_pack_data *data)
1430 const struct string_list_item *item;
1432 if (!data->wanted_refs.nr)
1435 packet_writer_write(&data->writer, "wanted-refs\n");
1437 for_each_string_list_item(item, &data->wanted_refs) {
1438 packet_writer_write(&data->writer, "%s %s\n",
1439 oid_to_hex(item->util),
1443 packet_writer_delim(&data->writer);
1446 static void send_shallow_info(struct upload_pack_data *data)
1448 /* No shallow info needs to be sent */
1449 if (!data->depth && !data->deepen_rev_list && !data->shallows.nr &&
1450 !is_repository_shallow(the_repository))
1453 packet_writer_write(&data->writer, "shallow-info\n");
1455 if (!send_shallow_list(&data->writer, data->depth,
1456 data->deepen_rev_list,
1457 data->deepen_since, &data->deepen_not,
1458 data->deepen_relative,
1459 &data->shallows, &data->want_obj) &&
1460 is_repository_shallow(the_repository))
1461 deepen(&data->writer, INFINITE_DEPTH, data->deepen_relative,
1462 &data->shallows, &data->want_obj);
1468 FETCH_PROCESS_ARGS = 0,
1474 int upload_pack_v2(struct repository *r, struct argv_array *keys,
1475 struct packet_reader *request)
1477 enum fetch_state state = FETCH_PROCESS_ARGS;
1478 struct upload_pack_data data;
1480 clear_object_flags(ALL_FLAGS);
1482 git_config(upload_pack_config, NULL);
1484 upload_pack_data_init(&data);
1485 use_sideband = LARGE_PACKET_MAX;
1487 while (state != FETCH_DONE) {
1489 case FETCH_PROCESS_ARGS:
1490 process_args(request, &data);
1492 if (!data.want_obj.nr) {
1494 * Request didn't contain any 'want' lines,
1495 * guess they didn't want anything.
1498 } else if (data.haves.nr) {
1500 * Request had 'have' lines, so lets ACK them.
1502 state = FETCH_SEND_ACKS;
1505 * Request had 'want's but no 'have's so we can
1506 * immedietly go to construct and send a pack.
1508 state = FETCH_SEND_PACK;
1511 case FETCH_SEND_ACKS:
1512 if (process_haves_and_send_acks(&data))
1513 state = FETCH_SEND_PACK;
1517 case FETCH_SEND_PACK:
1518 send_wanted_ref_info(&data);
1519 send_shallow_info(&data);
1521 packet_writer_write(&data.writer, "packfile\n");
1522 create_pack_file(&data);
1530 upload_pack_data_clear(&data);
1534 int upload_pack_advertise(struct repository *r,
1535 struct strbuf *value)
1538 int allow_filter_value;
1539 int allow_ref_in_want;
1540 int allow_sideband_all_value;
1542 strbuf_addstr(value, "shallow");
1544 if (!repo_config_get_bool(the_repository,
1545 "uploadpack.allowfilter",
1546 &allow_filter_value) &&
1548 strbuf_addstr(value, " filter");
1550 if (!repo_config_get_bool(the_repository,
1551 "uploadpack.allowrefinwant",
1552 &allow_ref_in_want) &&
1554 strbuf_addstr(value, " ref-in-want");
1556 if (git_env_bool("GIT_TEST_SIDEBAND_ALL", 0) ||
1557 (!repo_config_get_bool(the_repository,
1558 "uploadpack.allowsidebandall",
1559 &allow_sideband_all_value) &&
1560 allow_sideband_all_value))
1561 strbuf_addstr(value, " sideband-all");