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"
28 /* Remember to update object flag allocation in object.h */
29 #define THEY_HAVE (1u << 11)
30 #define OUR_REF (1u << 12)
31 #define WANTED (1u << 13)
32 #define COMMON_KNOWN (1u << 14)
33 #define REACHABLE (1u << 15)
35 #define SHALLOW (1u << 16)
36 #define NOT_SHALLOW (1u << 17)
37 #define CLIENT_SHALLOW (1u << 18)
38 #define HIDDEN_REF (1u << 19)
40 static timestamp_t oldest_have;
42 static int deepen_relative;
45 static int use_thin_pack, use_ofs_delta, use_include_tag;
46 static int no_progress, daemon_mode;
47 /* Allow specifying sha1 if it is a ref tip. */
48 #define ALLOW_TIP_SHA1 01
49 /* Allow request of a sha1 if it is reachable from a ref (possibly hidden ref). */
50 #define ALLOW_REACHABLE_SHA1 02
51 /* Allow request of any sha1. Implies ALLOW_TIP_SHA1 and ALLOW_REACHABLE_SHA1. */
52 #define ALLOW_ANY_SHA1 07
53 static unsigned int allow_unadvertised_object_request;
54 static int shallow_nr;
55 static struct object_array have_obj;
56 static struct object_array want_obj;
57 static struct object_array extra_edge_obj;
58 static unsigned int timeout;
59 static int keepalive = 5;
61 * otherwise maximum packet size (up to 65520 bytes).
63 static int use_sideband;
64 static int stateless_rpc;
65 static const char *pack_objects_hook;
67 static int filter_capability_requested;
68 static int allow_filter;
69 static struct list_objects_filter_options filter_options;
71 static void reset_timeout(void)
76 static void send_client_data(int fd, const char *data, ssize_t sz)
79 send_sideband(1, fd, data, sz, use_sideband);
86 /* XXX: are we happy to lose stuff here? */
90 write_or_die(fd, data, sz);
93 static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
96 if (graft->nr_parent == -1)
97 fprintf(fp, "--shallow %s\n", oid_to_hex(&graft->oid));
101 static void create_pack_file(void)
103 struct child_process pack_objects = CHILD_PROCESS_INIT;
104 char data[8193], progress[128];
105 char abort_msg[] = "aborting due to possible repository "
106 "corruption on the remote side.";
112 if (!pack_objects_hook)
113 pack_objects.git_cmd = 1;
115 argv_array_push(&pack_objects.args, pack_objects_hook);
116 argv_array_push(&pack_objects.args, "git");
117 pack_objects.use_shell = 1;
121 argv_array_push(&pack_objects.args, "--shallow-file");
122 argv_array_push(&pack_objects.args, "");
124 argv_array_push(&pack_objects.args, "pack-objects");
125 argv_array_push(&pack_objects.args, "--revs");
127 argv_array_push(&pack_objects.args, "--thin");
129 argv_array_push(&pack_objects.args, "--stdout");
131 argv_array_push(&pack_objects.args, "--shallow");
133 argv_array_push(&pack_objects.args, "--progress");
135 argv_array_push(&pack_objects.args, "--delta-base-offset");
137 argv_array_push(&pack_objects.args, "--include-tag");
138 if (filter_options.filter_spec) {
139 if (pack_objects.use_shell) {
140 struct strbuf buf = STRBUF_INIT;
141 sq_quote_buf(&buf, filter_options.filter_spec);
142 argv_array_pushf(&pack_objects.args, "--filter=%s", buf.buf);
143 strbuf_release(&buf);
145 argv_array_pushf(&pack_objects.args, "--filter=%s",
146 filter_options.filter_spec);
150 pack_objects.in = -1;
151 pack_objects.out = -1;
152 pack_objects.err = -1;
154 if (start_command(&pack_objects))
155 die("git upload-pack: unable to fork git-pack-objects");
157 pipe_fd = xfdopen(pack_objects.in, "w");
160 for_each_commit_graft(write_one_shallow, pipe_fd);
162 for (i = 0; i < want_obj.nr; i++)
163 fprintf(pipe_fd, "%s\n",
164 oid_to_hex(&want_obj.objects[i].item->oid));
165 fprintf(pipe_fd, "--not\n");
166 for (i = 0; i < have_obj.nr; i++)
167 fprintf(pipe_fd, "%s\n",
168 oid_to_hex(&have_obj.objects[i].item->oid));
169 for (i = 0; i < extra_edge_obj.nr; i++)
170 fprintf(pipe_fd, "%s\n",
171 oid_to_hex(&extra_edge_obj.objects[i].item->oid));
172 fprintf(pipe_fd, "\n");
176 /* We read from pack_objects.err to capture stderr output for
177 * progress bar, and pack_objects.out to capture the pack data.
181 struct pollfd pfd[2];
182 int pe, pu, pollsize;
190 if (0 <= pack_objects.out) {
191 pfd[pollsize].fd = pack_objects.out;
192 pfd[pollsize].events = POLLIN;
196 if (0 <= pack_objects.err) {
197 pfd[pollsize].fd = pack_objects.err;
198 pfd[pollsize].events = POLLIN;
206 ret = poll(pfd, pollsize,
207 keepalive < 0 ? -1 : 1000 * keepalive);
210 if (errno != EINTR) {
211 error_errno("poll failed, resuming");
216 if (0 <= pe && (pfd[pe].revents & (POLLIN|POLLHUP))) {
217 /* Status ready; we ship that in the side-band
218 * or dump to the standard error.
220 sz = xread(pack_objects.err, progress,
223 send_client_data(2, progress, sz);
225 close(pack_objects.err);
226 pack_objects.err = -1;
230 /* give priority to status messages */
233 if (0 <= pu && (pfd[pu].revents & (POLLIN|POLLHUP))) {
234 /* Data ready; we keep the last byte to ourselves
235 * in case we detect broken rev-list, so that we
236 * can leave the stream corrupted. This is
237 * unfortunate -- unpack-objects would happily
238 * accept a valid packdata with trailing garbage,
239 * so appending garbage after we pass all the
240 * pack data is not good enough to signal
241 * breakage to downstream.
249 sz = xread(pack_objects.out, cp,
250 sizeof(data) - outsz);
254 close(pack_objects.out);
255 pack_objects.out = -1;
261 buffered = data[sz-1] & 0xFF;
266 send_client_data(1, data, sz);
270 * We hit the keepalive timeout without saying anything; send
271 * an empty message on the data sideband just to let the other
272 * side know we're still working on it, but don't have any data
275 * If we don't have a sideband channel, there's no room in the
276 * protocol to say anything, so those clients are just out of
279 if (!ret && use_sideband) {
280 static const char buf[] = "0005\1";
281 write_or_die(1, buf, 5);
285 if (finish_command(&pack_objects)) {
286 error("git upload-pack: git-pack-objects died with error.");
293 send_client_data(1, data, 1);
294 fprintf(stderr, "flushed.\n");
301 send_client_data(3, abort_msg, sizeof(abort_msg));
302 die("git upload-pack: %s", abort_msg);
305 static int got_oid(const char *hex, struct object_id *oid)
308 int we_knew_they_have = 0;
310 if (get_oid_hex(hex, oid))
311 die("git upload-pack: expected SHA1 object, got '%s'", hex);
312 if (!has_object_file(oid))
315 o = parse_object(the_repository, oid);
317 die("oops (%s)", oid_to_hex(oid));
318 if (o->type == OBJ_COMMIT) {
319 struct commit_list *parents;
320 struct commit *commit = (struct commit *)o;
321 if (o->flags & THEY_HAVE)
322 we_knew_they_have = 1;
324 o->flags |= THEY_HAVE;
325 if (!oldest_have || (commit->date < oldest_have))
326 oldest_have = commit->date;
327 for (parents = commit->parents;
329 parents = parents->next)
330 parents->item->object.flags |= THEY_HAVE;
332 if (!we_knew_they_have) {
333 add_object_array(o, NULL, &have_obj);
339 static int reachable(struct commit *from, unsigned int with_flag,
340 unsigned int assign_flag, time_t min_commit_date)
342 struct prio_queue work = { compare_commits_by_commit_date };
344 prio_queue_put(&work, from);
346 struct commit_list *list;
347 struct commit *commit = prio_queue_get(&work);
349 if (commit->object.flags & with_flag) {
350 from->object.flags |= assign_flag;
353 if (!commit->object.parsed)
354 parse_object(the_repository, &commit->object.oid);
355 if (commit->object.flags & REACHABLE)
357 commit->object.flags |= REACHABLE;
358 if (commit->date < min_commit_date)
360 for (list = commit->parents; list; list = list->next) {
361 struct commit *parent = list->item;
362 if (!(parent->object.flags & REACHABLE))
363 prio_queue_put(&work, parent);
366 from->object.flags |= REACHABLE;
367 clear_commit_marks(from, REACHABLE);
368 clear_prio_queue(&work);
369 return (from->object.flags & assign_flag);
373 * Determine if every commit in 'from' can reach at least one commit
374 * that is marked with 'with_flag'. As we traverse, use 'assign_flag'
375 * as a marker for commits that are already visited. Do not walk
376 * commits with date below 'min_commit_date'.
378 static int can_all_from_reach_with_flag(struct object_array *from,
379 unsigned int with_flag,
380 unsigned int assign_flag,
381 time_t min_commit_date)
385 for (i = 0; i < from->nr; i++) {
386 struct object *from_one = from->objects[i].item;
388 if (from_one->flags & assign_flag)
390 from_one = deref_tag(the_repository, from_one, "a from object", 0);
391 if (!from_one || from_one->type != OBJ_COMMIT) {
392 /* no way to tell if this is reachable by
393 * looking at the ancestry chain alone, so
394 * leave a note to ourselves not to worry about
395 * this object anymore.
397 from->objects[i].item->flags |= assign_flag;
400 if (!reachable((struct commit *)from_one, with_flag, assign_flag,
407 static int ok_to_give_up(void)
412 return can_all_from_reach_with_flag(&want_obj, THEY_HAVE,
413 COMMON_KNOWN, oldest_have);
416 static int get_common_commits(void)
418 struct object_id oid;
419 char last_hex[GIT_MAX_HEXSZ + 1];
424 save_commit_buffer = 0;
427 char *line = packet_read_line(0, NULL);
433 if (multi_ack == 2 && got_common
434 && !got_other && ok_to_give_up()) {
436 packet_write_fmt(1, "ACK %s ready\n", last_hex);
438 if (have_obj.nr == 0 || multi_ack)
439 packet_write_fmt(1, "NAK\n");
441 if (no_done && sent_ready) {
442 packet_write_fmt(1, "ACK %s\n", last_hex);
451 if (skip_prefix(line, "have ", &arg)) {
452 switch (got_oid(arg, &oid)) {
453 case -1: /* they have what we do not */
455 if (multi_ack && ok_to_give_up()) {
456 const char *hex = oid_to_hex(&oid);
457 if (multi_ack == 2) {
459 packet_write_fmt(1, "ACK %s ready\n", hex);
461 packet_write_fmt(1, "ACK %s continue\n", hex);
466 oid_to_hex_r(last_hex, &oid);
468 packet_write_fmt(1, "ACK %s common\n", last_hex);
470 packet_write_fmt(1, "ACK %s continue\n", last_hex);
471 else if (have_obj.nr == 1)
472 packet_write_fmt(1, "ACK %s\n", last_hex);
477 if (!strcmp(line, "done")) {
478 if (have_obj.nr > 0) {
480 packet_write_fmt(1, "ACK %s\n", last_hex);
483 packet_write_fmt(1, "NAK\n");
486 die("git upload-pack: expected SHA1 list, got '%s'", line);
490 static int is_our_ref(struct object *o)
492 int allow_hidden_ref = (allow_unadvertised_object_request &
493 (ALLOW_TIP_SHA1 | ALLOW_REACHABLE_SHA1));
494 return o->flags & ((allow_hidden_ref ? HIDDEN_REF : 0) | OUR_REF);
498 * on successful case, it's up to the caller to close cmd->out
500 static int do_reachable_revlist(struct child_process *cmd,
501 struct object_array *src,
502 struct object_array *reachable)
504 static const char *argv[] = {
505 "rev-list", "--stdin", NULL,
508 char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */
518 * If the next rev-list --stdin encounters an unknown commit,
519 * it terminates, which will cause SIGPIPE in the write loop
522 sigchain_push(SIGPIPE, SIG_IGN);
524 if (start_command(cmd))
528 namebuf[GIT_SHA1_HEXSZ + 1] = '\n';
529 for (i = get_max_object_index(); 0 < i; ) {
530 o = get_indexed_object(--i);
533 if (reachable && o->type == OBJ_COMMIT)
534 o->flags &= ~TMP_MARK;
537 memcpy(namebuf + 1, oid_to_hex(&o->oid), GIT_SHA1_HEXSZ);
538 if (write_in_full(cmd->in, namebuf, GIT_SHA1_HEXSZ + 2) < 0)
541 namebuf[GIT_SHA1_HEXSZ] = '\n';
542 for (i = 0; i < src->nr; i++) {
543 o = src->objects[i].item;
546 add_object_array(o, NULL, reachable);
549 if (reachable && o->type == OBJ_COMMIT)
550 o->flags |= TMP_MARK;
551 memcpy(namebuf, oid_to_hex(&o->oid), GIT_SHA1_HEXSZ);
552 if (write_in_full(cmd->in, namebuf, GIT_SHA1_HEXSZ + 1) < 0)
557 sigchain_pop(SIGPIPE);
562 sigchain_pop(SIGPIPE);
571 static int get_reachable_list(struct object_array *src,
572 struct object_array *reachable)
574 struct child_process cmd = CHILD_PROCESS_INIT;
577 char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */
578 const unsigned hexsz = the_hash_algo->hexsz;
580 if (do_reachable_revlist(&cmd, src, reachable) < 0)
583 while ((i = read_in_full(cmd.out, namebuf, hexsz + 1)) == hexsz + 1) {
584 struct object_id sha1;
587 if (parse_oid_hex(namebuf, &sha1, &p) || *p != '\n')
590 o = lookup_object(the_repository, sha1.hash);
591 if (o && o->type == OBJ_COMMIT) {
592 o->flags &= ~TMP_MARK;
595 for (i = get_max_object_index(); 0 < i; i--) {
596 o = get_indexed_object(i - 1);
597 if (o && o->type == OBJ_COMMIT &&
598 (o->flags & TMP_MARK)) {
599 add_object_array(o, NULL, reachable);
600 o->flags &= ~TMP_MARK;
605 if (finish_command(&cmd))
611 static int has_unreachable(struct object_array *src)
613 struct child_process cmd = CHILD_PROCESS_INIT;
617 if (do_reachable_revlist(&cmd, src, NULL) < 0)
621 * The commits out of the rev-list are not ancestors of
624 i = read_in_full(cmd.out, buf, 1);
631 * rev-list may have died by encountering a bad commit
632 * in the history, in which case we do want to bail out
633 * even when it showed no commit.
635 if (finish_command(&cmd))
638 /* All the non-tip ones are ancestors of what we advertised */
642 sigchain_pop(SIGPIPE);
648 static void check_non_tip(void)
653 * In the normal in-process case without
654 * uploadpack.allowReachableSHA1InWant,
655 * non-tip requests can never happen.
657 if (!stateless_rpc && !(allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1))
659 if (!has_unreachable(&want_obj))
660 /* All the non-tip ones are ancestors of what we advertised */
664 /* Pick one of them (we know there at least is one) */
665 for (i = 0; i < want_obj.nr; i++) {
666 struct object *o = want_obj.objects[i].item;
668 die("git upload-pack: not our ref %s",
669 oid_to_hex(&o->oid));
673 static void send_shallow(struct commit_list *result)
676 struct object *object = &result->item->object;
677 if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) {
678 packet_write_fmt(1, "shallow %s",
679 oid_to_hex(&object->oid));
680 register_shallow(the_repository, &object->oid);
683 result = result->next;
687 static void send_unshallow(const struct object_array *shallows)
691 for (i = 0; i < shallows->nr; i++) {
692 struct object *object = shallows->objects[i].item;
693 if (object->flags & NOT_SHALLOW) {
694 struct commit_list *parents;
695 packet_write_fmt(1, "unshallow %s",
696 oid_to_hex(&object->oid));
697 object->flags &= ~CLIENT_SHALLOW;
699 * We want to _register_ "object" as shallow, but we
700 * also need to traverse object's parents to deepen a
701 * shallow clone. Unregister it for now so we can
702 * parse and add the parents to the want list, then
705 unregister_shallow(&object->oid);
707 parse_commit_or_die((struct commit *)object);
708 parents = ((struct commit *)object)->parents;
710 add_object_array(&parents->item->object,
712 parents = parents->next;
714 add_object_array(object, NULL, &extra_edge_obj);
716 /* make sure commit traversal conforms to client */
717 register_shallow(the_repository, &object->oid);
721 static void deepen(int depth, int deepen_relative,
722 struct object_array *shallows)
724 if (depth == INFINITE_DEPTH && !is_repository_shallow(the_repository)) {
727 for (i = 0; i < shallows->nr; i++) {
728 struct object *object = shallows->objects[i].item;
729 object->flags |= NOT_SHALLOW;
731 } else if (deepen_relative) {
732 struct object_array reachable_shallows = OBJECT_ARRAY_INIT;
733 struct commit_list *result;
735 get_reachable_list(shallows, &reachable_shallows);
736 result = get_shallow_commits(&reachable_shallows,
738 SHALLOW, NOT_SHALLOW);
739 send_shallow(result);
740 free_commit_list(result);
741 object_array_clear(&reachable_shallows);
743 struct commit_list *result;
745 result = get_shallow_commits(&want_obj, depth,
746 SHALLOW, NOT_SHALLOW);
747 send_shallow(result);
748 free_commit_list(result);
751 send_unshallow(shallows);
754 static void deepen_by_rev_list(int ac, const char **av,
755 struct object_array *shallows)
757 struct commit_list *result;
759 result = get_shallow_commits_by_rev_list(ac, av, SHALLOW, NOT_SHALLOW);
760 send_shallow(result);
761 free_commit_list(result);
762 send_unshallow(shallows);
765 /* Returns 1 if a shallow list is sent or 0 otherwise */
766 static int send_shallow_list(int depth, int deepen_rev_list,
767 timestamp_t deepen_since,
768 struct string_list *deepen_not,
769 struct object_array *shallows)
773 if (depth > 0 && deepen_rev_list)
774 die("git upload-pack: deepen and deepen-since (or deepen-not) cannot be used together");
776 deepen(depth, deepen_relative, shallows);
778 } else if (deepen_rev_list) {
779 struct argv_array av = ARGV_ARRAY_INIT;
782 argv_array_push(&av, "rev-list");
784 argv_array_pushf(&av, "--max-age=%"PRItime, deepen_since);
785 if (deepen_not->nr) {
786 argv_array_push(&av, "--not");
787 for (i = 0; i < deepen_not->nr; i++) {
788 struct string_list_item *s = deepen_not->items + i;
789 argv_array_push(&av, s->string);
791 argv_array_push(&av, "--not");
793 for (i = 0; i < want_obj.nr; i++) {
794 struct object *o = want_obj.objects[i].item;
795 argv_array_push(&av, oid_to_hex(&o->oid));
797 deepen_by_rev_list(av.argc, av.argv, shallows);
798 argv_array_clear(&av);
801 if (shallows->nr > 0) {
803 for (i = 0; i < shallows->nr; i++)
804 register_shallow(the_repository,
805 &shallows->objects[i].item->oid);
809 shallow_nr += shallows->nr;
813 static int process_shallow(const char *line, struct object_array *shallows)
816 if (skip_prefix(line, "shallow ", &arg)) {
817 struct object_id oid;
818 struct object *object;
819 if (get_oid_hex(arg, &oid))
820 die("invalid shallow line: %s", line);
821 object = parse_object(the_repository, &oid);
824 if (object->type != OBJ_COMMIT)
825 die("invalid shallow object %s", oid_to_hex(&oid));
826 if (!(object->flags & CLIENT_SHALLOW)) {
827 object->flags |= CLIENT_SHALLOW;
828 add_object_array(object, NULL, shallows);
836 static int process_deepen(const char *line, int *depth)
839 if (skip_prefix(line, "deepen ", &arg)) {
841 *depth = (int)strtol(arg, &end, 0);
842 if (!end || *end || *depth <= 0)
843 die("Invalid deepen: %s", line);
850 static int process_deepen_since(const char *line, timestamp_t *deepen_since, int *deepen_rev_list)
853 if (skip_prefix(line, "deepen-since ", &arg)) {
855 *deepen_since = parse_timestamp(arg, &end, 0);
856 if (!end || *end || !deepen_since ||
857 /* revisions.c's max_age -1 is special */
859 die("Invalid deepen-since: %s", line);
860 *deepen_rev_list = 1;
866 static int process_deepen_not(const char *line, struct string_list *deepen_not, int *deepen_rev_list)
869 if (skip_prefix(line, "deepen-not ", &arg)) {
871 struct object_id oid;
872 if (expand_ref(arg, strlen(arg), &oid, &ref) != 1)
873 die("git upload-pack: ambiguous deepen-not: %s", line);
874 string_list_append(deepen_not, ref);
876 *deepen_rev_list = 1;
882 static void receive_needs(void)
884 struct object_array shallows = OBJECT_ARRAY_INIT;
885 struct string_list deepen_not = STRING_LIST_INIT_DUP;
888 timestamp_t deepen_since = 0;
889 int deepen_rev_list = 0;
894 const char *features;
895 struct object_id oid_buf;
896 char *line = packet_read_line(0, NULL);
903 if (process_shallow(line, &shallows))
905 if (process_deepen(line, &depth))
907 if (process_deepen_since(line, &deepen_since, &deepen_rev_list))
909 if (process_deepen_not(line, &deepen_not, &deepen_rev_list))
912 if (skip_prefix(line, "filter ", &arg)) {
913 if (!filter_capability_requested)
914 die("git upload-pack: filtering capability not negotiated");
915 parse_list_objects_filter(&filter_options, arg);
919 if (!skip_prefix(line, "want ", &arg) ||
920 parse_oid_hex(arg, &oid_buf, &features))
921 die("git upload-pack: protocol error, "
922 "expected to get object ID, not '%s'", line);
924 if (parse_feature_request(features, "deepen-relative"))
926 if (parse_feature_request(features, "multi_ack_detailed"))
928 else if (parse_feature_request(features, "multi_ack"))
930 if (parse_feature_request(features, "no-done"))
932 if (parse_feature_request(features, "thin-pack"))
934 if (parse_feature_request(features, "ofs-delta"))
936 if (parse_feature_request(features, "side-band-64k"))
937 use_sideband = LARGE_PACKET_MAX;
938 else if (parse_feature_request(features, "side-band"))
939 use_sideband = DEFAULT_PACKET_MAX;
940 if (parse_feature_request(features, "no-progress"))
942 if (parse_feature_request(features, "include-tag"))
944 if (allow_filter && parse_feature_request(features, "filter"))
945 filter_capability_requested = 1;
947 o = parse_object(the_repository, &oid_buf);
950 "ERR upload-pack: not our ref %s",
951 oid_to_hex(&oid_buf));
952 die("git upload-pack: not our ref %s",
953 oid_to_hex(&oid_buf));
955 if (!(o->flags & WANTED)) {
957 if (!((allow_unadvertised_object_request & ALLOW_ANY_SHA1) == ALLOW_ANY_SHA1
960 add_object_array(o, NULL, &want_obj);
965 * We have sent all our refs already, and the other end
966 * should have chosen out of them. When we are operating
967 * in the stateless RPC mode, however, their choice may
968 * have been based on the set of older refs advertised
969 * by another process that handled the initial request.
974 if (!use_sideband && daemon_mode)
977 if (depth == 0 && !deepen_rev_list && shallows.nr == 0)
980 if (send_shallow_list(depth, deepen_rev_list, deepen_since,
981 &deepen_not, &shallows))
983 object_array_clear(&shallows);
986 /* return non-zero if the ref is hidden, otherwise 0 */
987 static int mark_our_ref(const char *refname, const char *refname_full,
988 const struct object_id *oid)
990 struct object *o = lookup_unknown_object(oid->hash);
992 if (ref_is_hidden(refname, refname_full)) {
993 o->flags |= HIDDEN_REF;
1000 static int check_ref(const char *refname_full, const struct object_id *oid,
1001 int flag, void *cb_data)
1003 const char *refname = strip_namespace(refname_full);
1005 mark_our_ref(refname, refname_full, oid);
1009 static void format_symref_info(struct strbuf *buf, struct string_list *symref)
1011 struct string_list_item *item;
1015 for_each_string_list_item(item, symref)
1016 strbuf_addf(buf, " symref=%s:%s", item->string, (char *)item->util);
1019 static int send_ref(const char *refname, const struct object_id *oid,
1020 int flag, void *cb_data)
1022 static const char *capabilities = "multi_ack thin-pack side-band"
1023 " side-band-64k ofs-delta shallow deepen-since deepen-not"
1024 " deepen-relative no-progress include-tag multi_ack_detailed";
1025 const char *refname_nons = strip_namespace(refname);
1026 struct object_id peeled;
1028 if (mark_our_ref(refname_nons, refname, oid))
1032 struct strbuf symref_info = STRBUF_INIT;
1034 format_symref_info(&symref_info, cb_data);
1035 packet_write_fmt(1, "%s %s%c%s%s%s%s%s%s agent=%s\n",
1036 oid_to_hex(oid), refname_nons,
1038 (allow_unadvertised_object_request & ALLOW_TIP_SHA1) ?
1039 " allow-tip-sha1-in-want" : "",
1040 (allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1) ?
1041 " allow-reachable-sha1-in-want" : "",
1042 stateless_rpc ? " no-done" : "",
1044 allow_filter ? " filter" : "",
1045 git_user_agent_sanitized());
1046 strbuf_release(&symref_info);
1048 packet_write_fmt(1, "%s %s\n", oid_to_hex(oid), refname_nons);
1050 capabilities = NULL;
1051 if (!peel_ref(refname, &peeled))
1052 packet_write_fmt(1, "%s %s^{}\n", oid_to_hex(&peeled), refname_nons);
1056 static int find_symref(const char *refname, const struct object_id *oid,
1057 int flag, void *cb_data)
1059 const char *symref_target;
1060 struct string_list_item *item;
1062 if ((flag & REF_ISSYMREF) == 0)
1064 symref_target = resolve_ref_unsafe(refname, 0, NULL, &flag);
1065 if (!symref_target || (flag & REF_ISSYMREF) == 0)
1066 die("'%s' is a symref but it is not?", refname);
1067 item = string_list_append(cb_data, refname);
1068 item->util = xstrdup(symref_target);
1072 static int upload_pack_config(const char *var, const char *value, void *unused)
1074 if (!strcmp("uploadpack.allowtipsha1inwant", var)) {
1075 if (git_config_bool(var, value))
1076 allow_unadvertised_object_request |= ALLOW_TIP_SHA1;
1078 allow_unadvertised_object_request &= ~ALLOW_TIP_SHA1;
1079 } else if (!strcmp("uploadpack.allowreachablesha1inwant", var)) {
1080 if (git_config_bool(var, value))
1081 allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1;
1083 allow_unadvertised_object_request &= ~ALLOW_REACHABLE_SHA1;
1084 } else if (!strcmp("uploadpack.allowanysha1inwant", var)) {
1085 if (git_config_bool(var, value))
1086 allow_unadvertised_object_request |= ALLOW_ANY_SHA1;
1088 allow_unadvertised_object_request &= ~ALLOW_ANY_SHA1;
1089 } else if (!strcmp("uploadpack.keepalive", var)) {
1090 keepalive = git_config_int(var, value);
1093 } else if (current_config_scope() != CONFIG_SCOPE_REPO) {
1094 if (!strcmp("uploadpack.packobjectshook", var))
1095 return git_config_string(&pack_objects_hook, var, value);
1096 } else if (!strcmp("uploadpack.allowfilter", var)) {
1097 allow_filter = git_config_bool(var, value);
1099 return parse_hide_refs_config(var, value, "uploadpack");
1102 void upload_pack(struct upload_pack_options *options)
1104 struct string_list symref = STRING_LIST_INIT_DUP;
1106 stateless_rpc = options->stateless_rpc;
1107 timeout = options->timeout;
1108 daemon_mode = options->daemon_mode;
1110 git_config(upload_pack_config, NULL);
1112 head_ref_namespaced(find_symref, &symref);
1114 if (options->advertise_refs || !stateless_rpc) {
1116 head_ref_namespaced(send_ref, &symref);
1117 for_each_namespaced_ref(send_ref, &symref);
1118 advertise_shallow_grafts(1);
1121 head_ref_namespaced(check_ref, NULL);
1122 for_each_namespaced_ref(check_ref, NULL);
1124 string_list_clear(&symref, 1);
1125 if (options->advertise_refs)
1130 get_common_commits();
1135 struct upload_pack_data {
1136 struct object_array wants;
1137 struct oid_array haves;
1139 struct object_array shallows;
1140 struct string_list deepen_not;
1142 timestamp_t deepen_since;
1143 int deepen_rev_list;
1144 int deepen_relative;
1146 unsigned stateless_rpc : 1;
1148 unsigned use_thin_pack : 1;
1149 unsigned use_ofs_delta : 1;
1150 unsigned no_progress : 1;
1151 unsigned use_include_tag : 1;
1155 static void upload_pack_data_init(struct upload_pack_data *data)
1157 struct object_array wants = OBJECT_ARRAY_INIT;
1158 struct oid_array haves = OID_ARRAY_INIT;
1159 struct object_array shallows = OBJECT_ARRAY_INIT;
1160 struct string_list deepen_not = STRING_LIST_INIT_DUP;
1162 memset(data, 0, sizeof(*data));
1163 data->wants = wants;
1164 data->haves = haves;
1165 data->shallows = shallows;
1166 data->deepen_not = deepen_not;
1169 static void upload_pack_data_clear(struct upload_pack_data *data)
1171 object_array_clear(&data->wants);
1172 oid_array_clear(&data->haves);
1173 object_array_clear(&data->shallows);
1174 string_list_clear(&data->deepen_not, 0);
1177 static int parse_want(const char *line)
1180 if (skip_prefix(line, "want ", &arg)) {
1181 struct object_id oid;
1184 if (get_oid_hex(arg, &oid))
1185 die("git upload-pack: protocol error, "
1186 "expected to get oid, not '%s'", line);
1188 o = parse_object(the_repository, &oid);
1191 "ERR upload-pack: not our ref %s",
1193 die("git upload-pack: not our ref %s",
1197 if (!(o->flags & WANTED)) {
1199 add_object_array(o, NULL, &want_obj);
1208 static int parse_have(const char *line, struct oid_array *haves)
1211 if (skip_prefix(line, "have ", &arg)) {
1212 struct object_id oid;
1214 if (get_oid_hex(arg, &oid))
1215 die("git upload-pack: expected SHA1 object, got '%s'", arg);
1216 oid_array_append(haves, &oid);
1223 static void process_args(struct packet_reader *request,
1224 struct upload_pack_data *data)
1226 while (packet_reader_read(request) != PACKET_READ_FLUSH) {
1227 const char *arg = request->line;
1231 if (parse_want(arg))
1233 /* process have line */
1234 if (parse_have(arg, &data->haves))
1237 /* process args like thin-pack */
1238 if (!strcmp(arg, "thin-pack")) {
1242 if (!strcmp(arg, "ofs-delta")) {
1246 if (!strcmp(arg, "no-progress")) {
1250 if (!strcmp(arg, "include-tag")) {
1251 use_include_tag = 1;
1254 if (!strcmp(arg, "done")) {
1259 /* Shallow related arguments */
1260 if (process_shallow(arg, &data->shallows))
1262 if (process_deepen(arg, &data->depth))
1264 if (process_deepen_since(arg, &data->deepen_since,
1265 &data->deepen_rev_list))
1267 if (process_deepen_not(arg, &data->deepen_not,
1268 &data->deepen_rev_list))
1270 if (!strcmp(arg, "deepen-relative")) {
1271 data->deepen_relative = 1;
1275 if (allow_filter && skip_prefix(arg, "filter ", &p)) {
1276 parse_list_objects_filter(&filter_options, p);
1280 /* ignore unknown lines maybe? */
1281 die("unexpected line: '%s'", arg);
1285 static int process_haves(struct oid_array *haves, struct oid_array *common)
1290 for (i = 0; i < haves->nr; i++) {
1291 const struct object_id *oid = &haves->oid[i];
1293 int we_knew_they_have = 0;
1295 if (!has_object_file(oid))
1298 oid_array_append(common, oid);
1300 o = parse_object(the_repository, oid);
1302 die("oops (%s)", oid_to_hex(oid));
1303 if (o->type == OBJ_COMMIT) {
1304 struct commit_list *parents;
1305 struct commit *commit = (struct commit *)o;
1306 if (o->flags & THEY_HAVE)
1307 we_knew_they_have = 1;
1309 o->flags |= THEY_HAVE;
1310 if (!oldest_have || (commit->date < oldest_have))
1311 oldest_have = commit->date;
1312 for (parents = commit->parents;
1314 parents = parents->next)
1315 parents->item->object.flags |= THEY_HAVE;
1317 if (!we_knew_they_have)
1318 add_object_array(o, NULL, &have_obj);
1324 static int send_acks(struct oid_array *acks, struct strbuf *response)
1328 packet_buf_write(response, "acknowledgments\n");
1332 packet_buf_write(response, "NAK\n");
1334 for (i = 0; i < acks->nr; i++) {
1335 packet_buf_write(response, "ACK %s\n",
1336 oid_to_hex(&acks->oid[i]));
1339 if (ok_to_give_up()) {
1341 packet_buf_write(response, "ready\n");
1348 static int process_haves_and_send_acks(struct upload_pack_data *data)
1350 struct oid_array common = OID_ARRAY_INIT;
1351 struct strbuf response = STRBUF_INIT;
1354 process_haves(&data->haves, &common);
1357 } else if (send_acks(&common, &response)) {
1358 packet_buf_delim(&response);
1362 packet_buf_flush(&response);
1367 write_or_die(1, response.buf, response.len);
1368 strbuf_release(&response);
1370 oid_array_clear(&data->haves);
1371 oid_array_clear(&common);
1375 static void send_shallow_info(struct upload_pack_data *data)
1377 /* No shallow info needs to be sent */
1378 if (!data->depth && !data->deepen_rev_list && !data->shallows.nr &&
1379 !is_repository_shallow(the_repository))
1382 packet_write_fmt(1, "shallow-info\n");
1384 if (!send_shallow_list(data->depth, data->deepen_rev_list,
1385 data->deepen_since, &data->deepen_not,
1387 is_repository_shallow(the_repository))
1388 deepen(INFINITE_DEPTH, data->deepen_relative, &data->shallows);
1394 FETCH_PROCESS_ARGS = 0,
1400 int upload_pack_v2(struct repository *r, struct argv_array *keys,
1401 struct packet_reader *request)
1403 enum fetch_state state = FETCH_PROCESS_ARGS;
1404 struct upload_pack_data data;
1406 git_config(upload_pack_config, NULL);
1408 upload_pack_data_init(&data);
1409 use_sideband = LARGE_PACKET_MAX;
1411 while (state != FETCH_DONE) {
1413 case FETCH_PROCESS_ARGS:
1414 process_args(request, &data);
1418 * Request didn't contain any 'want' lines,
1419 * guess they didn't want anything.
1422 } else if (data.haves.nr) {
1424 * Request had 'have' lines, so lets ACK them.
1426 state = FETCH_SEND_ACKS;
1429 * Request had 'want's but no 'have's so we can
1430 * immedietly go to construct and send a pack.
1432 state = FETCH_SEND_PACK;
1435 case FETCH_SEND_ACKS:
1436 if (process_haves_and_send_acks(&data))
1437 state = FETCH_SEND_PACK;
1441 case FETCH_SEND_PACK:
1442 send_shallow_info(&data);
1444 packet_write_fmt(1, "packfile\n");
1453 upload_pack_data_clear(&data);
1457 int upload_pack_advertise(struct repository *r,
1458 struct strbuf *value)
1461 int allow_filter_value;
1462 strbuf_addstr(value, "shallow");
1463 if (!repo_config_get_bool(the_repository,
1464 "uploadpack.allowfilter",
1465 &allow_filter_value) &&
1467 strbuf_addstr(value, " filter");