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"
30 /* Remember to update object flag allocation in object.h */
31 #define THEY_HAVE (1u << 11)
32 #define OUR_REF (1u << 12)
33 #define WANTED (1u << 13)
34 #define COMMON_KNOWN (1u << 14)
36 #define SHALLOW (1u << 16)
37 #define NOT_SHALLOW (1u << 17)
38 #define CLIENT_SHALLOW (1u << 18)
39 #define HIDDEN_REF (1u << 19)
41 #define ALL_FLAGS (THEY_HAVE | OUR_REF | WANTED | COMMON_KNOWN | SHALLOW | \
42 NOT_SHALLOW | CLIENT_SHALLOW | HIDDEN_REF)
44 static timestamp_t oldest_have
;
48 static int use_thin_pack
, use_ofs_delta
, use_include_tag
;
49 static int no_progress
, daemon_mode
;
50 /* Allow specifying sha1 if it is a ref tip. */
51 #define ALLOW_TIP_SHA1 01
52 /* Allow request of a sha1 if it is reachable from a ref (possibly hidden ref). */
53 #define ALLOW_REACHABLE_SHA1 02
54 /* Allow request of any sha1. Implies ALLOW_TIP_SHA1 and ALLOW_REACHABLE_SHA1. */
55 #define ALLOW_ANY_SHA1 07
56 static unsigned int allow_unadvertised_object_request
;
57 static int shallow_nr
;
58 static struct object_array extra_edge_obj
;
59 static unsigned int timeout
;
60 static int keepalive
= 5;
62 * otherwise maximum packet size (up to 65520 bytes).
64 static int use_sideband
;
65 static int stateless_rpc
;
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
;
71 static struct list_objects_filter_options filter_options
;
73 static int allow_sideband_all
;
75 static void reset_timeout(void)
80 static void send_client_data(int fd
, const char *data
, ssize_t sz
)
83 send_sideband(1, fd
, data
, sz
, use_sideband
);
90 /* XXX: are we happy to lose stuff here? */
94 write_or_die(fd
, data
, sz
);
97 static int write_one_shallow(const struct commit_graft
*graft
, void *cb_data
)
100 if (graft
->nr_parent
== -1)
101 fprintf(fp
, "--shallow %s\n", oid_to_hex(&graft
->oid
));
105 static void create_pack_file(const struct object_array
*have_obj
,
106 const struct object_array
*want_obj
)
108 struct child_process pack_objects
= CHILD_PROCESS_INIT
;
109 char data
[8193], progress
[128];
110 char abort_msg
[] = "aborting due to possible repository "
111 "corruption on the remote side.";
117 if (!pack_objects_hook
)
118 pack_objects
.git_cmd
= 1;
120 argv_array_push(&pack_objects
.args
, pack_objects_hook
);
121 argv_array_push(&pack_objects
.args
, "git");
122 pack_objects
.use_shell
= 1;
126 argv_array_push(&pack_objects
.args
, "--shallow-file");
127 argv_array_push(&pack_objects
.args
, "");
129 argv_array_push(&pack_objects
.args
, "pack-objects");
130 argv_array_push(&pack_objects
.args
, "--revs");
132 argv_array_push(&pack_objects
.args
, "--thin");
134 argv_array_push(&pack_objects
.args
, "--stdout");
136 argv_array_push(&pack_objects
.args
, "--shallow");
138 argv_array_push(&pack_objects
.args
, "--progress");
140 argv_array_push(&pack_objects
.args
, "--delta-base-offset");
142 argv_array_push(&pack_objects
.args
, "--include-tag");
143 if (filter_options
.filter_spec
) {
144 struct strbuf expanded_filter_spec
= STRBUF_INIT
;
145 expand_list_objects_filter_spec(&filter_options
,
146 &expanded_filter_spec
);
147 if (pack_objects
.use_shell
) {
148 struct strbuf buf
= STRBUF_INIT
;
149 sq_quote_buf(&buf
, expanded_filter_spec
.buf
);
150 argv_array_pushf(&pack_objects
.args
, "--filter=%s", buf
.buf
);
151 strbuf_release(&buf
);
153 argv_array_pushf(&pack_objects
.args
, "--filter=%s",
154 expanded_filter_spec
.buf
);
158 pack_objects
.in
= -1;
159 pack_objects
.out
= -1;
160 pack_objects
.err
= -1;
162 if (start_command(&pack_objects
))
163 die("git upload-pack: unable to fork git-pack-objects");
165 pipe_fd
= xfdopen(pack_objects
.in
, "w");
168 for_each_commit_graft(write_one_shallow
, pipe_fd
);
170 for (i
= 0; i
< want_obj
->nr
; i
++)
171 fprintf(pipe_fd
, "%s\n",
172 oid_to_hex(&want_obj
->objects
[i
].item
->oid
));
173 fprintf(pipe_fd
, "--not\n");
174 for (i
= 0; i
< have_obj
->nr
; i
++)
175 fprintf(pipe_fd
, "%s\n",
176 oid_to_hex(&have_obj
->objects
[i
].item
->oid
));
177 for (i
= 0; i
< extra_edge_obj
.nr
; i
++)
178 fprintf(pipe_fd
, "%s\n",
179 oid_to_hex(&extra_edge_obj
.objects
[i
].item
->oid
));
180 fprintf(pipe_fd
, "\n");
184 /* We read from pack_objects.err to capture stderr output for
185 * progress bar, and pack_objects.out to capture the pack data.
189 struct pollfd pfd
[2];
190 int pe
, pu
, pollsize
;
198 if (0 <= pack_objects
.out
) {
199 pfd
[pollsize
].fd
= pack_objects
.out
;
200 pfd
[pollsize
].events
= POLLIN
;
204 if (0 <= pack_objects
.err
) {
205 pfd
[pollsize
].fd
= pack_objects
.err
;
206 pfd
[pollsize
].events
= POLLIN
;
214 ret
= poll(pfd
, pollsize
,
215 keepalive
< 0 ? -1 : 1000 * keepalive
);
218 if (errno
!= EINTR
) {
219 error_errno("poll failed, resuming");
224 if (0 <= pe
&& (pfd
[pe
].revents
& (POLLIN
|POLLHUP
))) {
225 /* Status ready; we ship that in the side-band
226 * or dump to the standard error.
228 sz
= xread(pack_objects
.err
, progress
,
231 send_client_data(2, progress
, sz
);
233 close(pack_objects
.err
);
234 pack_objects
.err
= -1;
238 /* give priority to status messages */
241 if (0 <= pu
&& (pfd
[pu
].revents
& (POLLIN
|POLLHUP
))) {
242 /* Data ready; we keep the last byte to ourselves
243 * in case we detect broken rev-list, so that we
244 * can leave the stream corrupted. This is
245 * unfortunate -- unpack-objects would happily
246 * accept a valid packdata with trailing garbage,
247 * so appending garbage after we pass all the
248 * pack data is not good enough to signal
249 * breakage to downstream.
257 sz
= xread(pack_objects
.out
, cp
,
258 sizeof(data
) - outsz
);
262 close(pack_objects
.out
);
263 pack_objects
.out
= -1;
269 buffered
= data
[sz
-1] & 0xFF;
274 send_client_data(1, data
, sz
);
278 * We hit the keepalive timeout without saying anything; send
279 * an empty message on the data sideband just to let the other
280 * side know we're still working on it, but don't have any data
283 * If we don't have a sideband channel, there's no room in the
284 * protocol to say anything, so those clients are just out of
287 if (!ret
&& use_sideband
) {
288 static const char buf
[] = "0005\1";
289 write_or_die(1, buf
, 5);
293 if (finish_command(&pack_objects
)) {
294 error("git upload-pack: git-pack-objects died with error.");
301 send_client_data(1, data
, 1);
302 fprintf(stderr
, "flushed.\n");
309 send_client_data(3, abort_msg
, sizeof(abort_msg
));
310 die("git upload-pack: %s", abort_msg
);
313 static int got_oid(const char *hex
, struct object_id
*oid
,
314 struct object_array
*have_obj
)
317 int we_knew_they_have
= 0;
319 if (get_oid_hex(hex
, oid
))
320 die("git upload-pack: expected SHA1 object, got '%s'", hex
);
321 if (!has_object_file(oid
))
324 o
= parse_object(the_repository
, oid
);
326 die("oops (%s)", oid_to_hex(oid
));
327 if (o
->type
== OBJ_COMMIT
) {
328 struct commit_list
*parents
;
329 struct commit
*commit
= (struct commit
*)o
;
330 if (o
->flags
& THEY_HAVE
)
331 we_knew_they_have
= 1;
333 o
->flags
|= THEY_HAVE
;
334 if (!oldest_have
|| (commit
->date
< oldest_have
))
335 oldest_have
= commit
->date
;
336 for (parents
= commit
->parents
;
338 parents
= parents
->next
)
339 parents
->item
->object
.flags
|= THEY_HAVE
;
341 if (!we_knew_they_have
) {
342 add_object_array(o
, NULL
, have_obj
);
348 static int ok_to_give_up(const struct object_array
*have_obj
,
349 struct object_array
*want_obj
)
351 uint32_t min_generation
= GENERATION_NUMBER_ZERO
;
356 return can_all_from_reach_with_flag(want_obj
, THEY_HAVE
,
357 COMMON_KNOWN
, oldest_have
,
361 static int get_common_commits(struct packet_reader
*reader
,
362 struct object_array
*have_obj
,
363 struct object_array
*want_obj
)
365 struct object_id oid
;
366 char last_hex
[GIT_MAX_HEXSZ
+ 1];
371 save_commit_buffer
= 0;
378 if (packet_reader_read(reader
) != PACKET_READ_NORMAL
) {
379 if (multi_ack
== 2 && got_common
380 && !got_other
&& ok_to_give_up(have_obj
, want_obj
)) {
382 packet_write_fmt(1, "ACK %s ready\n", last_hex
);
384 if (have_obj
->nr
== 0 || multi_ack
)
385 packet_write_fmt(1, "NAK\n");
387 if (no_done
&& sent_ready
) {
388 packet_write_fmt(1, "ACK %s\n", last_hex
);
397 if (skip_prefix(reader
->line
, "have ", &arg
)) {
398 switch (got_oid(arg
, &oid
, have_obj
)) {
399 case -1: /* they have what we do not */
401 if (multi_ack
&& ok_to_give_up(have_obj
, want_obj
)) {
402 const char *hex
= oid_to_hex(&oid
);
403 if (multi_ack
== 2) {
405 packet_write_fmt(1, "ACK %s ready\n", hex
);
407 packet_write_fmt(1, "ACK %s continue\n", hex
);
412 oid_to_hex_r(last_hex
, &oid
);
414 packet_write_fmt(1, "ACK %s common\n", last_hex
);
416 packet_write_fmt(1, "ACK %s continue\n", last_hex
);
417 else if (have_obj
->nr
== 1)
418 packet_write_fmt(1, "ACK %s\n", last_hex
);
423 if (!strcmp(reader
->line
, "done")) {
424 if (have_obj
->nr
> 0) {
426 packet_write_fmt(1, "ACK %s\n", last_hex
);
429 packet_write_fmt(1, "NAK\n");
432 die("git upload-pack: expected SHA1 list, got '%s'", reader
->line
);
436 static int is_our_ref(struct object
*o
)
438 int allow_hidden_ref
= (allow_unadvertised_object_request
&
439 (ALLOW_TIP_SHA1
| ALLOW_REACHABLE_SHA1
));
440 return o
->flags
& ((allow_hidden_ref
? HIDDEN_REF
: 0) | OUR_REF
);
444 * on successful case, it's up to the caller to close cmd->out
446 static int do_reachable_revlist(struct child_process
*cmd
,
447 struct object_array
*src
,
448 struct object_array
*reachable
)
450 static const char *argv
[] = {
451 "rev-list", "--stdin", NULL
,
454 char namebuf
[GIT_MAX_HEXSZ
+ 2]; /* ^ + hash + LF */
456 const unsigned hexsz
= the_hash_algo
->hexsz
;
465 * If the next rev-list --stdin encounters an unknown commit,
466 * it terminates, which will cause SIGPIPE in the write loop
469 sigchain_push(SIGPIPE
, SIG_IGN
);
471 if (start_command(cmd
))
475 namebuf
[hexsz
+ 1] = '\n';
476 for (i
= get_max_object_index(); 0 < i
; ) {
477 o
= get_indexed_object(--i
);
480 if (reachable
&& o
->type
== OBJ_COMMIT
)
481 o
->flags
&= ~TMP_MARK
;
484 memcpy(namebuf
+ 1, oid_to_hex(&o
->oid
), hexsz
);
485 if (write_in_full(cmd
->in
, namebuf
, hexsz
+ 2) < 0)
488 namebuf
[hexsz
] = '\n';
489 for (i
= 0; i
< src
->nr
; i
++) {
490 o
= src
->objects
[i
].item
;
493 add_object_array(o
, NULL
, reachable
);
496 if (reachable
&& o
->type
== OBJ_COMMIT
)
497 o
->flags
|= TMP_MARK
;
498 memcpy(namebuf
, oid_to_hex(&o
->oid
), hexsz
);
499 if (write_in_full(cmd
->in
, namebuf
, hexsz
+ 1) < 0)
504 sigchain_pop(SIGPIPE
);
509 sigchain_pop(SIGPIPE
);
518 static int get_reachable_list(struct object_array
*src
,
519 struct object_array
*reachable
)
521 struct child_process cmd
= CHILD_PROCESS_INIT
;
524 char namebuf
[GIT_MAX_HEXSZ
+ 2]; /* ^ + hash + LF */
525 const unsigned hexsz
= the_hash_algo
->hexsz
;
527 if (do_reachable_revlist(&cmd
, src
, reachable
) < 0)
530 while ((i
= read_in_full(cmd
.out
, namebuf
, hexsz
+ 1)) == hexsz
+ 1) {
531 struct object_id sha1
;
534 if (parse_oid_hex(namebuf
, &sha1
, &p
) || *p
!= '\n')
537 o
= lookup_object(the_repository
, sha1
.hash
);
538 if (o
&& o
->type
== OBJ_COMMIT
) {
539 o
->flags
&= ~TMP_MARK
;
542 for (i
= get_max_object_index(); 0 < i
; i
--) {
543 o
= get_indexed_object(i
- 1);
544 if (o
&& o
->type
== OBJ_COMMIT
&&
545 (o
->flags
& TMP_MARK
)) {
546 add_object_array(o
, NULL
, reachable
);
547 o
->flags
&= ~TMP_MARK
;
552 if (finish_command(&cmd
))
558 static int has_unreachable(struct object_array
*src
)
560 struct child_process cmd
= CHILD_PROCESS_INIT
;
564 if (do_reachable_revlist(&cmd
, src
, NULL
) < 0)
568 * The commits out of the rev-list are not ancestors of
571 i
= read_in_full(cmd
.out
, buf
, 1);
578 * rev-list may have died by encountering a bad commit
579 * in the history, in which case we do want to bail out
580 * even when it showed no commit.
582 if (finish_command(&cmd
))
585 /* All the non-tip ones are ancestors of what we advertised */
589 sigchain_pop(SIGPIPE
);
595 static void check_non_tip(struct object_array
*want_obj
,
596 struct packet_writer
*writer
)
601 * In the normal in-process case without
602 * uploadpack.allowReachableSHA1InWant,
603 * non-tip requests can never happen.
605 if (!stateless_rpc
&& !(allow_unadvertised_object_request
& ALLOW_REACHABLE_SHA1
))
607 if (!has_unreachable(want_obj
))
608 /* All the non-tip ones are ancestors of what we advertised */
612 /* Pick one of them (we know there at least is one) */
613 for (i
= 0; i
< want_obj
->nr
; i
++) {
614 struct object
*o
= want_obj
->objects
[i
].item
;
615 if (!is_our_ref(o
)) {
616 packet_writer_error(writer
,
617 "upload-pack: not our ref %s",
618 oid_to_hex(&o
->oid
));
619 die("git upload-pack: not our ref %s",
620 oid_to_hex(&o
->oid
));
625 static void send_shallow(struct packet_writer
*writer
,
626 struct commit_list
*result
)
629 struct object
*object
= &result
->item
->object
;
630 if (!(object
->flags
& (CLIENT_SHALLOW
|NOT_SHALLOW
))) {
631 packet_writer_write(writer
, "shallow %s",
632 oid_to_hex(&object
->oid
));
633 register_shallow(the_repository
, &object
->oid
);
636 result
= result
->next
;
640 static void send_unshallow(struct packet_writer
*writer
,
641 const struct object_array
*shallows
,
642 struct object_array
*want_obj
)
646 for (i
= 0; i
< shallows
->nr
; i
++) {
647 struct object
*object
= shallows
->objects
[i
].item
;
648 if (object
->flags
& NOT_SHALLOW
) {
649 struct commit_list
*parents
;
650 packet_writer_write(writer
, "unshallow %s",
651 oid_to_hex(&object
->oid
));
652 object
->flags
&= ~CLIENT_SHALLOW
;
654 * We want to _register_ "object" as shallow, but we
655 * also need to traverse object's parents to deepen a
656 * shallow clone. Unregister it for now so we can
657 * parse and add the parents to the want list, then
660 unregister_shallow(&object
->oid
);
662 parse_commit_or_die((struct commit
*)object
);
663 parents
= ((struct commit
*)object
)->parents
;
665 add_object_array(&parents
->item
->object
,
667 parents
= parents
->next
;
669 add_object_array(object
, NULL
, &extra_edge_obj
);
671 /* make sure commit traversal conforms to client */
672 register_shallow(the_repository
, &object
->oid
);
676 static int check_ref(const char *refname_full
, const struct object_id
*oid
,
677 int flag
, void *cb_data
);
678 static void deepen(struct packet_writer
*writer
, int depth
, int deepen_relative
,
679 struct object_array
*shallows
, struct object_array
*want_obj
)
681 if (depth
== INFINITE_DEPTH
&& !is_repository_shallow(the_repository
)) {
684 for (i
= 0; i
< shallows
->nr
; i
++) {
685 struct object
*object
= shallows
->objects
[i
].item
;
686 object
->flags
|= NOT_SHALLOW
;
688 } else if (deepen_relative
) {
689 struct object_array reachable_shallows
= OBJECT_ARRAY_INIT
;
690 struct commit_list
*result
;
693 * Checking for reachable shallows requires that our refs be
694 * marked with OUR_REF.
696 head_ref_namespaced(check_ref
, NULL
);
697 for_each_namespaced_ref(check_ref
, NULL
);
699 get_reachable_list(shallows
, &reachable_shallows
);
700 result
= get_shallow_commits(&reachable_shallows
,
702 SHALLOW
, NOT_SHALLOW
);
703 send_shallow(writer
, result
);
704 free_commit_list(result
);
705 object_array_clear(&reachable_shallows
);
707 struct commit_list
*result
;
709 result
= get_shallow_commits(want_obj
, depth
,
710 SHALLOW
, NOT_SHALLOW
);
711 send_shallow(writer
, result
);
712 free_commit_list(result
);
715 send_unshallow(writer
, shallows
, want_obj
);
718 static void deepen_by_rev_list(struct packet_writer
*writer
, int ac
,
720 struct object_array
*shallows
,
721 struct object_array
*want_obj
)
723 struct commit_list
*result
;
725 close_commit_graph(the_repository
);
726 result
= get_shallow_commits_by_rev_list(ac
, av
, SHALLOW
, NOT_SHALLOW
);
727 send_shallow(writer
, result
);
728 free_commit_list(result
);
729 send_unshallow(writer
, shallows
, want_obj
);
732 /* Returns 1 if a shallow list is sent or 0 otherwise */
733 static int send_shallow_list(struct packet_writer
*writer
,
734 int depth
, int deepen_rev_list
,
735 timestamp_t deepen_since
,
736 struct string_list
*deepen_not
,
738 struct object_array
*shallows
,
739 struct object_array
*want_obj
)
743 if (depth
> 0 && deepen_rev_list
)
744 die("git upload-pack: deepen and deepen-since (or deepen-not) cannot be used together");
746 deepen(writer
, depth
, deepen_relative
, shallows
, want_obj
);
748 } else if (deepen_rev_list
) {
749 struct argv_array av
= ARGV_ARRAY_INIT
;
752 argv_array_push(&av
, "rev-list");
754 argv_array_pushf(&av
, "--max-age=%"PRItime
, deepen_since
);
755 if (deepen_not
->nr
) {
756 argv_array_push(&av
, "--not");
757 for (i
= 0; i
< deepen_not
->nr
; i
++) {
758 struct string_list_item
*s
= deepen_not
->items
+ i
;
759 argv_array_push(&av
, s
->string
);
761 argv_array_push(&av
, "--not");
763 for (i
= 0; i
< want_obj
->nr
; i
++) {
764 struct object
*o
= want_obj
->objects
[i
].item
;
765 argv_array_push(&av
, oid_to_hex(&o
->oid
));
767 deepen_by_rev_list(writer
, av
.argc
, av
.argv
, shallows
, want_obj
);
768 argv_array_clear(&av
);
771 if (shallows
->nr
> 0) {
773 for (i
= 0; i
< shallows
->nr
; i
++)
774 register_shallow(the_repository
,
775 &shallows
->objects
[i
].item
->oid
);
779 shallow_nr
+= shallows
->nr
;
783 static int process_shallow(const char *line
, struct object_array
*shallows
)
786 if (skip_prefix(line
, "shallow ", &arg
)) {
787 struct object_id oid
;
788 struct object
*object
;
789 if (get_oid_hex(arg
, &oid
))
790 die("invalid shallow line: %s", line
);
791 object
= parse_object(the_repository
, &oid
);
794 if (object
->type
!= OBJ_COMMIT
)
795 die("invalid shallow object %s", oid_to_hex(&oid
));
796 if (!(object
->flags
& CLIENT_SHALLOW
)) {
797 object
->flags
|= CLIENT_SHALLOW
;
798 add_object_array(object
, NULL
, shallows
);
806 static int process_deepen(const char *line
, int *depth
)
809 if (skip_prefix(line
, "deepen ", &arg
)) {
811 *depth
= (int)strtol(arg
, &end
, 0);
812 if (!end
|| *end
|| *depth
<= 0)
813 die("Invalid deepen: %s", line
);
820 static int process_deepen_since(const char *line
, timestamp_t
*deepen_since
, int *deepen_rev_list
)
823 if (skip_prefix(line
, "deepen-since ", &arg
)) {
825 *deepen_since
= parse_timestamp(arg
, &end
, 0);
826 if (!end
|| *end
|| !deepen_since
||
827 /* revisions.c's max_age -1 is special */
829 die("Invalid deepen-since: %s", line
);
830 *deepen_rev_list
= 1;
836 static int process_deepen_not(const char *line
, struct string_list
*deepen_not
, int *deepen_rev_list
)
839 if (skip_prefix(line
, "deepen-not ", &arg
)) {
841 struct object_id oid
;
842 if (expand_ref(arg
, strlen(arg
), &oid
, &ref
) != 1)
843 die("git upload-pack: ambiguous deepen-not: %s", line
);
844 string_list_append(deepen_not
, ref
);
846 *deepen_rev_list
= 1;
852 static void receive_needs(struct packet_reader
*reader
, struct object_array
*want_obj
)
854 struct object_array shallows
= OBJECT_ARRAY_INIT
;
855 struct string_list deepen_not
= STRING_LIST_INIT_DUP
;
858 timestamp_t deepen_since
= 0;
859 int deepen_rev_list
= 0;
860 int deepen_relative
= 0;
861 struct packet_writer writer
;
864 packet_writer_init(&writer
, 1);
867 const char *features
;
868 struct object_id oid_buf
;
872 if (packet_reader_read(reader
) != PACKET_READ_NORMAL
)
875 if (process_shallow(reader
->line
, &shallows
))
877 if (process_deepen(reader
->line
, &depth
))
879 if (process_deepen_since(reader
->line
, &deepen_since
, &deepen_rev_list
))
881 if (process_deepen_not(reader
->line
, &deepen_not
, &deepen_rev_list
))
884 if (skip_prefix(reader
->line
, "filter ", &arg
)) {
885 if (!filter_capability_requested
)
886 die("git upload-pack: filtering capability not negotiated");
887 parse_list_objects_filter(&filter_options
, arg
);
891 if (!skip_prefix(reader
->line
, "want ", &arg
) ||
892 parse_oid_hex(arg
, &oid_buf
, &features
))
893 die("git upload-pack: protocol error, "
894 "expected to get object ID, not '%s'", reader
->line
);
896 if (parse_feature_request(features
, "deepen-relative"))
898 if (parse_feature_request(features
, "multi_ack_detailed"))
900 else if (parse_feature_request(features
, "multi_ack"))
902 if (parse_feature_request(features
, "no-done"))
904 if (parse_feature_request(features
, "thin-pack"))
906 if (parse_feature_request(features
, "ofs-delta"))
908 if (parse_feature_request(features
, "side-band-64k"))
909 use_sideband
= LARGE_PACKET_MAX
;
910 else if (parse_feature_request(features
, "side-band"))
911 use_sideband
= DEFAULT_PACKET_MAX
;
912 if (parse_feature_request(features
, "no-progress"))
914 if (parse_feature_request(features
, "include-tag"))
916 if (allow_filter
&& parse_feature_request(features
, "filter"))
917 filter_capability_requested
= 1;
919 o
= parse_object(the_repository
, &oid_buf
);
921 packet_writer_error(&writer
,
922 "upload-pack: not our ref %s",
923 oid_to_hex(&oid_buf
));
924 die("git upload-pack: not our ref %s",
925 oid_to_hex(&oid_buf
));
927 if (!(o
->flags
& WANTED
)) {
929 if (!((allow_unadvertised_object_request
& ALLOW_ANY_SHA1
) == ALLOW_ANY_SHA1
932 add_object_array(o
, NULL
, want_obj
);
937 * We have sent all our refs already, and the other end
938 * should have chosen out of them. When we are operating
939 * in the stateless RPC mode, however, their choice may
940 * have been based on the set of older refs advertised
941 * by another process that handled the initial request.
944 check_non_tip(want_obj
, &writer
);
946 if (!use_sideband
&& daemon_mode
)
949 if (depth
== 0 && !deepen_rev_list
&& shallows
.nr
== 0)
952 if (send_shallow_list(&writer
, depth
, deepen_rev_list
, deepen_since
,
953 &deepen_not
, deepen_relative
, &shallows
,
956 object_array_clear(&shallows
);
959 /* return non-zero if the ref is hidden, otherwise 0 */
960 static int mark_our_ref(const char *refname
, const char *refname_full
,
961 const struct object_id
*oid
)
963 struct object
*o
= lookup_unknown_object(oid
->hash
);
965 if (ref_is_hidden(refname
, refname_full
)) {
966 o
->flags
|= HIDDEN_REF
;
973 static int check_ref(const char *refname_full
, const struct object_id
*oid
,
974 int flag
, void *cb_data
)
976 const char *refname
= strip_namespace(refname_full
);
978 mark_our_ref(refname
, refname_full
, oid
);
982 static void format_symref_info(struct strbuf
*buf
, struct string_list
*symref
)
984 struct string_list_item
*item
;
988 for_each_string_list_item(item
, symref
)
989 strbuf_addf(buf
, " symref=%s:%s", item
->string
, (char *)item
->util
);
992 static int send_ref(const char *refname
, const struct object_id
*oid
,
993 int flag
, void *cb_data
)
995 static const char *capabilities
= "multi_ack thin-pack side-band"
996 " side-band-64k ofs-delta shallow deepen-since deepen-not"
997 " deepen-relative no-progress include-tag multi_ack_detailed";
998 const char *refname_nons
= strip_namespace(refname
);
999 struct object_id peeled
;
1001 if (mark_our_ref(refname_nons
, refname
, oid
))
1005 struct strbuf symref_info
= STRBUF_INIT
;
1007 format_symref_info(&symref_info
, cb_data
);
1008 packet_write_fmt(1, "%s %s%c%s%s%s%s%s%s agent=%s\n",
1009 oid_to_hex(oid
), refname_nons
,
1011 (allow_unadvertised_object_request
& ALLOW_TIP_SHA1
) ?
1012 " allow-tip-sha1-in-want" : "",
1013 (allow_unadvertised_object_request
& ALLOW_REACHABLE_SHA1
) ?
1014 " allow-reachable-sha1-in-want" : "",
1015 stateless_rpc
? " no-done" : "",
1017 allow_filter
? " filter" : "",
1018 git_user_agent_sanitized());
1019 strbuf_release(&symref_info
);
1021 packet_write_fmt(1, "%s %s\n", oid_to_hex(oid
), refname_nons
);
1023 capabilities
= NULL
;
1024 if (!peel_ref(refname
, &peeled
))
1025 packet_write_fmt(1, "%s %s^{}\n", oid_to_hex(&peeled
), refname_nons
);
1029 static int find_symref(const char *refname
, const struct object_id
*oid
,
1030 int flag
, void *cb_data
)
1032 const char *symref_target
;
1033 struct string_list_item
*item
;
1035 if ((flag
& REF_ISSYMREF
) == 0)
1037 symref_target
= resolve_ref_unsafe(refname
, 0, NULL
, &flag
);
1038 if (!symref_target
|| (flag
& REF_ISSYMREF
) == 0)
1039 die("'%s' is a symref but it is not?", refname
);
1040 item
= string_list_append(cb_data
, refname
);
1041 item
->util
= xstrdup(symref_target
);
1045 static int upload_pack_config(const char *var
, const char *value
, void *unused
)
1047 if (!strcmp("uploadpack.allowtipsha1inwant", var
)) {
1048 if (git_config_bool(var
, value
))
1049 allow_unadvertised_object_request
|= ALLOW_TIP_SHA1
;
1051 allow_unadvertised_object_request
&= ~ALLOW_TIP_SHA1
;
1052 } else if (!strcmp("uploadpack.allowreachablesha1inwant", var
)) {
1053 if (git_config_bool(var
, value
))
1054 allow_unadvertised_object_request
|= ALLOW_REACHABLE_SHA1
;
1056 allow_unadvertised_object_request
&= ~ALLOW_REACHABLE_SHA1
;
1057 } else if (!strcmp("uploadpack.allowanysha1inwant", var
)) {
1058 if (git_config_bool(var
, value
))
1059 allow_unadvertised_object_request
|= ALLOW_ANY_SHA1
;
1061 allow_unadvertised_object_request
&= ~ALLOW_ANY_SHA1
;
1062 } else if (!strcmp("uploadpack.keepalive", var
)) {
1063 keepalive
= git_config_int(var
, value
);
1066 } else if (!strcmp("uploadpack.allowfilter", var
)) {
1067 allow_filter
= git_config_bool(var
, value
);
1068 } else if (!strcmp("uploadpack.allowrefinwant", var
)) {
1069 allow_ref_in_want
= git_config_bool(var
, value
);
1070 } else if (!strcmp("uploadpack.allowsidebandall", var
)) {
1071 allow_sideband_all
= git_config_bool(var
, value
);
1074 if (current_config_scope() != CONFIG_SCOPE_REPO
) {
1075 if (!strcmp("uploadpack.packobjectshook", var
))
1076 return git_config_string(&pack_objects_hook
, var
, value
);
1079 return parse_hide_refs_config(var
, value
, "uploadpack");
1082 void upload_pack(struct upload_pack_options
*options
)
1084 struct string_list symref
= STRING_LIST_INIT_DUP
;
1085 struct object_array want_obj
= OBJECT_ARRAY_INIT
;
1086 struct packet_reader reader
;
1088 stateless_rpc
= options
->stateless_rpc
;
1089 timeout
= options
->timeout
;
1090 daemon_mode
= options
->daemon_mode
;
1092 git_config(upload_pack_config
, NULL
);
1094 head_ref_namespaced(find_symref
, &symref
);
1096 if (options
->advertise_refs
|| !stateless_rpc
) {
1098 head_ref_namespaced(send_ref
, &symref
);
1099 for_each_namespaced_ref(send_ref
, &symref
);
1100 advertise_shallow_grafts(1);
1103 head_ref_namespaced(check_ref
, NULL
);
1104 for_each_namespaced_ref(check_ref
, NULL
);
1106 string_list_clear(&symref
, 1);
1107 if (options
->advertise_refs
)
1110 packet_reader_init(&reader
, 0, NULL
, 0,
1111 PACKET_READ_CHOMP_NEWLINE
|
1112 PACKET_READ_DIE_ON_ERR_PACKET
);
1114 receive_needs(&reader
, &want_obj
);
1116 struct object_array have_obj
= OBJECT_ARRAY_INIT
;
1117 get_common_commits(&reader
, &have_obj
, &want_obj
);
1118 create_pack_file(&have_obj
, &want_obj
);
1122 struct upload_pack_data
{
1123 struct object_array wants
;
1124 struct string_list wanted_refs
;
1125 struct oid_array haves
;
1127 struct object_array shallows
;
1128 struct string_list deepen_not
;
1130 timestamp_t deepen_since
;
1131 int deepen_rev_list
;
1132 int deepen_relative
;
1134 struct packet_writer writer
;
1136 unsigned stateless_rpc
: 1;
1138 unsigned use_thin_pack
: 1;
1139 unsigned use_ofs_delta
: 1;
1140 unsigned no_progress
: 1;
1141 unsigned use_include_tag
: 1;
1145 static void upload_pack_data_init(struct upload_pack_data
*data
)
1147 struct object_array wants
= OBJECT_ARRAY_INIT
;
1148 struct string_list wanted_refs
= STRING_LIST_INIT_DUP
;
1149 struct oid_array haves
= OID_ARRAY_INIT
;
1150 struct object_array shallows
= OBJECT_ARRAY_INIT
;
1151 struct string_list deepen_not
= STRING_LIST_INIT_DUP
;
1153 memset(data
, 0, sizeof(*data
));
1154 data
->wants
= wants
;
1155 data
->wanted_refs
= wanted_refs
;
1156 data
->haves
= haves
;
1157 data
->shallows
= shallows
;
1158 data
->deepen_not
= deepen_not
;
1159 packet_writer_init(&data
->writer
, 1);
1162 static void upload_pack_data_clear(struct upload_pack_data
*data
)
1164 object_array_clear(&data
->wants
);
1165 string_list_clear(&data
->wanted_refs
, 1);
1166 oid_array_clear(&data
->haves
);
1167 object_array_clear(&data
->shallows
);
1168 string_list_clear(&data
->deepen_not
, 0);
1171 static int parse_want(struct packet_writer
*writer
, const char *line
,
1172 struct object_array
*want_obj
)
1175 if (skip_prefix(line
, "want ", &arg
)) {
1176 struct object_id oid
;
1179 if (get_oid_hex(arg
, &oid
))
1180 die("git upload-pack: protocol error, "
1181 "expected to get oid, not '%s'", line
);
1183 o
= parse_object(the_repository
, &oid
);
1185 packet_writer_error(writer
,
1186 "upload-pack: not our ref %s",
1188 die("git upload-pack: not our ref %s",
1192 if (!(o
->flags
& WANTED
)) {
1194 add_object_array(o
, NULL
, want_obj
);
1203 static int parse_want_ref(struct packet_writer
*writer
, const char *line
,
1204 struct string_list
*wanted_refs
,
1205 struct object_array
*want_obj
)
1208 if (skip_prefix(line
, "want-ref ", &arg
)) {
1209 struct object_id oid
;
1210 struct string_list_item
*item
;
1213 if (read_ref(arg
, &oid
)) {
1214 packet_writer_error(writer
, "unknown ref %s", arg
);
1215 die("unknown ref %s", arg
);
1218 item
= string_list_append(wanted_refs
, arg
);
1219 item
->util
= oiddup(&oid
);
1221 o
= parse_object_or_die(&oid
, arg
);
1222 if (!(o
->flags
& WANTED
)) {
1224 add_object_array(o
, NULL
, want_obj
);
1233 static int parse_have(const char *line
, struct oid_array
*haves
)
1236 if (skip_prefix(line
, "have ", &arg
)) {
1237 struct object_id oid
;
1239 if (get_oid_hex(arg
, &oid
))
1240 die("git upload-pack: expected SHA1 object, got '%s'", arg
);
1241 oid_array_append(haves
, &oid
);
1248 static void process_args(struct packet_reader
*request
,
1249 struct upload_pack_data
*data
,
1250 struct object_array
*want_obj
)
1252 while (packet_reader_read(request
) != PACKET_READ_FLUSH
) {
1253 const char *arg
= request
->line
;
1257 if (parse_want(&data
->writer
, arg
, want_obj
))
1259 if (allow_ref_in_want
&&
1260 parse_want_ref(&data
->writer
, arg
, &data
->wanted_refs
,
1263 /* process have line */
1264 if (parse_have(arg
, &data
->haves
))
1267 /* process args like thin-pack */
1268 if (!strcmp(arg
, "thin-pack")) {
1272 if (!strcmp(arg
, "ofs-delta")) {
1276 if (!strcmp(arg
, "no-progress")) {
1280 if (!strcmp(arg
, "include-tag")) {
1281 use_include_tag
= 1;
1284 if (!strcmp(arg
, "done")) {
1289 /* Shallow related arguments */
1290 if (process_shallow(arg
, &data
->shallows
))
1292 if (process_deepen(arg
, &data
->depth
))
1294 if (process_deepen_since(arg
, &data
->deepen_since
,
1295 &data
->deepen_rev_list
))
1297 if (process_deepen_not(arg
, &data
->deepen_not
,
1298 &data
->deepen_rev_list
))
1300 if (!strcmp(arg
, "deepen-relative")) {
1301 data
->deepen_relative
= 1;
1305 if (allow_filter
&& skip_prefix(arg
, "filter ", &p
)) {
1306 parse_list_objects_filter(&filter_options
, p
);
1310 if ((git_env_bool("GIT_TEST_SIDEBAND_ALL", 0) ||
1311 allow_sideband_all
) &&
1312 !strcmp(arg
, "sideband-all")) {
1313 data
->writer
.use_sideband
= 1;
1317 /* ignore unknown lines maybe? */
1318 die("unexpected line: '%s'", arg
);
1322 static int process_haves(struct oid_array
*haves
, struct oid_array
*common
,
1323 struct object_array
*have_obj
)
1328 for (i
= 0; i
< haves
->nr
; i
++) {
1329 const struct object_id
*oid
= &haves
->oid
[i
];
1331 int we_knew_they_have
= 0;
1333 if (!has_object_file(oid
))
1336 oid_array_append(common
, oid
);
1338 o
= parse_object(the_repository
, oid
);
1340 die("oops (%s)", oid_to_hex(oid
));
1341 if (o
->type
== OBJ_COMMIT
) {
1342 struct commit_list
*parents
;
1343 struct commit
*commit
= (struct commit
*)o
;
1344 if (o
->flags
& THEY_HAVE
)
1345 we_knew_they_have
= 1;
1347 o
->flags
|= THEY_HAVE
;
1348 if (!oldest_have
|| (commit
->date
< oldest_have
))
1349 oldest_have
= commit
->date
;
1350 for (parents
= commit
->parents
;
1352 parents
= parents
->next
)
1353 parents
->item
->object
.flags
|= THEY_HAVE
;
1355 if (!we_knew_they_have
)
1356 add_object_array(o
, NULL
, have_obj
);
1362 static int send_acks(struct packet_writer
*writer
, struct oid_array
*acks
,
1363 const struct object_array
*have_obj
,
1364 struct object_array
*want_obj
)
1368 packet_writer_write(writer
, "acknowledgments\n");
1372 packet_writer_write(writer
, "NAK\n");
1374 for (i
= 0; i
< acks
->nr
; i
++) {
1375 packet_writer_write(writer
, "ACK %s\n",
1376 oid_to_hex(&acks
->oid
[i
]));
1379 if (ok_to_give_up(have_obj
, want_obj
)) {
1381 packet_writer_write(writer
, "ready\n");
1388 static int process_haves_and_send_acks(struct upload_pack_data
*data
,
1389 struct object_array
*have_obj
,
1390 struct object_array
*want_obj
)
1392 struct oid_array common
= OID_ARRAY_INIT
;
1395 process_haves(&data
->haves
, &common
, have_obj
);
1398 } else if (send_acks(&data
->writer
, &common
, have_obj
, want_obj
)) {
1399 packet_writer_delim(&data
->writer
);
1403 packet_writer_flush(&data
->writer
);
1407 oid_array_clear(&data
->haves
);
1408 oid_array_clear(&common
);
1412 static void send_wanted_ref_info(struct upload_pack_data
*data
)
1414 const struct string_list_item
*item
;
1416 if (!data
->wanted_refs
.nr
)
1419 packet_writer_write(&data
->writer
, "wanted-refs\n");
1421 for_each_string_list_item(item
, &data
->wanted_refs
) {
1422 packet_writer_write(&data
->writer
, "%s %s\n",
1423 oid_to_hex(item
->util
),
1427 packet_writer_delim(&data
->writer
);
1430 static void send_shallow_info(struct upload_pack_data
*data
,
1431 struct object_array
*want_obj
)
1433 /* No shallow info needs to be sent */
1434 if (!data
->depth
&& !data
->deepen_rev_list
&& !data
->shallows
.nr
&&
1435 !is_repository_shallow(the_repository
))
1438 packet_writer_write(&data
->writer
, "shallow-info\n");
1440 if (!send_shallow_list(&data
->writer
, data
->depth
,
1441 data
->deepen_rev_list
,
1442 data
->deepen_since
, &data
->deepen_not
,
1443 data
->deepen_relative
,
1444 &data
->shallows
, want_obj
) &&
1445 is_repository_shallow(the_repository
))
1446 deepen(&data
->writer
, INFINITE_DEPTH
, data
->deepen_relative
,
1447 &data
->shallows
, want_obj
);
1453 FETCH_PROCESS_ARGS
= 0,
1459 int upload_pack_v2(struct repository
*r
, struct argv_array
*keys
,
1460 struct packet_reader
*request
)
1462 enum fetch_state state
= FETCH_PROCESS_ARGS
;
1463 struct upload_pack_data data
;
1464 struct object_array have_obj
= OBJECT_ARRAY_INIT
;
1465 struct object_array want_obj
= OBJECT_ARRAY_INIT
;
1467 clear_object_flags(ALL_FLAGS
);
1469 git_config(upload_pack_config
, NULL
);
1471 upload_pack_data_init(&data
);
1472 use_sideband
= LARGE_PACKET_MAX
;
1474 while (state
!= FETCH_DONE
) {
1476 case FETCH_PROCESS_ARGS
:
1477 process_args(request
, &data
, &want_obj
);
1481 * Request didn't contain any 'want' lines,
1482 * guess they didn't want anything.
1485 } else if (data
.haves
.nr
) {
1487 * Request had 'have' lines, so lets ACK them.
1489 state
= FETCH_SEND_ACKS
;
1492 * Request had 'want's but no 'have's so we can
1493 * immedietly go to construct and send a pack.
1495 state
= FETCH_SEND_PACK
;
1498 case FETCH_SEND_ACKS
:
1499 if (process_haves_and_send_acks(&data
, &have_obj
,
1501 state
= FETCH_SEND_PACK
;
1505 case FETCH_SEND_PACK
:
1506 send_wanted_ref_info(&data
);
1507 send_shallow_info(&data
, &want_obj
);
1509 packet_writer_write(&data
.writer
, "packfile\n");
1510 create_pack_file(&have_obj
, &want_obj
);
1518 upload_pack_data_clear(&data
);
1519 object_array_clear(&have_obj
);
1520 object_array_clear(&want_obj
);
1524 int upload_pack_advertise(struct repository
*r
,
1525 struct strbuf
*value
)
1528 int allow_filter_value
;
1529 int allow_ref_in_want
;
1530 int allow_sideband_all_value
;
1532 strbuf_addstr(value
, "shallow");
1534 if (!repo_config_get_bool(the_repository
,
1535 "uploadpack.allowfilter",
1536 &allow_filter_value
) &&
1538 strbuf_addstr(value
, " filter");
1540 if (!repo_config_get_bool(the_repository
,
1541 "uploadpack.allowrefinwant",
1542 &allow_ref_in_want
) &&
1544 strbuf_addstr(value
, " ref-in-want");
1546 if (git_env_bool("GIT_TEST_SIDEBAND_ALL", 0) ||
1547 (!repo_config_get_bool(the_repository
,
1548 "uploadpack.allowsidebandall",
1549 &allow_sideband_all_value
) &&
1550 allow_sideband_all_value
))
1551 strbuf_addstr(value
, " sideband-all");