11 #include "list-objects.h"
12 #include "run-command.h"
15 #include "string-list.h"
17 static const char upload_pack_usage
[] = "git upload-pack [--strict] [--timeout=<n>] <dir>";
19 /* bits #0..7 in revision.h, #8..10 in commit.c */
20 #define THEY_HAVE (1u << 11)
21 #define OUR_REF (1u << 12)
22 #define WANTED (1u << 13)
23 #define COMMON_KNOWN (1u << 14)
24 #define REACHABLE (1u << 15)
26 #define SHALLOW (1u << 16)
27 #define NOT_SHALLOW (1u << 17)
28 #define CLIENT_SHALLOW (1u << 18)
30 static unsigned long oldest_have
;
34 static int use_thin_pack
, use_ofs_delta
, use_include_tag
;
35 static int no_progress
, daemon_mode
;
36 static int shallow_nr
;
37 static struct object_array have_obj
;
38 static struct object_array want_obj
;
39 static struct object_array extra_edge_obj
;
40 static unsigned int timeout
;
42 * otherwise maximum packet size (up to 65520 bytes).
44 static int use_sideband
;
46 static int advertise_refs
;
47 static int stateless_rpc
;
49 static void reset_timeout(void)
54 static int strip(char *line
, int len
)
56 if (len
&& line
[len
-1] == '\n')
61 static ssize_t
send_client_data(int fd
, const char *data
, ssize_t sz
)
64 return send_sideband(1, fd
, data
, sz
, use_sideband
);
69 /* XXX: are we happy to lose stuff here? */
73 return safe_write(fd
, data
, sz
);
76 static FILE *pack_pipe
= NULL
;
77 static void show_commit(struct commit
*commit
, void *data
)
79 if (commit
->object
.flags
& BOUNDARY
)
80 fputc('-', pack_pipe
);
81 if (fputs(sha1_to_hex(commit
->object
.sha1
), pack_pipe
) < 0)
82 die("broken output pipe");
83 fputc('\n', pack_pipe
);
86 commit
->buffer
= NULL
;
89 static void show_object(struct object
*obj
,
90 const struct name_path
*path
, const char *component
,
93 show_object_with_name(pack_pipe
, obj
, path
, component
);
96 static void show_edge(struct commit
*commit
)
98 fprintf(pack_pipe
, "-%s\n", sha1_to_hex(commit
->object
.sha1
));
101 static int do_rev_list(int in
, int out
, void *user_data
)
104 struct rev_info revs
;
106 pack_pipe
= xfdopen(out
, "w");
107 init_revisions(&revs
, NULL
);
108 revs
.tag_objects
= 1;
109 revs
.tree_objects
= 1;
110 revs
.blob_objects
= 1;
114 for (i
= 0; i
< want_obj
.nr
; i
++) {
115 struct object
*o
= want_obj
.objects
[i
].item
;
117 o
->flags
&= ~UNINTERESTING
;
118 add_pending_object(&revs
, o
, NULL
);
120 for (i
= 0; i
< have_obj
.nr
; i
++) {
121 struct object
*o
= have_obj
.objects
[i
].item
;
122 o
->flags
|= UNINTERESTING
;
123 add_pending_object(&revs
, o
, NULL
);
125 setup_revisions(0, NULL
, &revs
, NULL
);
126 if (prepare_revision_walk(&revs
))
127 die("revision walk setup failed");
128 mark_edges_uninteresting(revs
.commits
, &revs
, show_edge
);
130 for (i
= 0; i
< extra_edge_obj
.nr
; i
++)
131 fprintf(pack_pipe
, "-%s\n", sha1_to_hex(
132 extra_edge_obj
.objects
[i
].item
->sha1
));
133 traverse_commit_list(&revs
, show_commit
, show_object
, NULL
);
139 static void create_pack_file(void)
141 struct async rev_list
;
142 struct child_process pack_objects
;
143 char data
[8193], progress
[128];
144 char abort_msg
[] = "aborting due to possible repository "
145 "corruption on the remote side.";
148 const char *argv
[10];
151 argv
[arg
++] = "pack-objects";
153 argv
[arg
++] = "--revs";
155 argv
[arg
++] = "--thin";
158 argv
[arg
++] = "--stdout";
160 argv
[arg
++] = "--progress";
162 argv
[arg
++] = "--delta-base-offset";
164 argv
[arg
++] = "--include-tag";
167 memset(&pack_objects
, 0, sizeof(pack_objects
));
168 pack_objects
.in
= -1;
169 pack_objects
.out
= -1;
170 pack_objects
.err
= -1;
171 pack_objects
.git_cmd
= 1;
172 pack_objects
.argv
= argv
;
174 if (start_command(&pack_objects
))
175 die("git upload-pack: unable to fork git-pack-objects");
178 memset(&rev_list
, 0, sizeof(rev_list
));
179 rev_list
.proc
= do_rev_list
;
180 rev_list
.out
= pack_objects
.in
;
181 if (start_async(&rev_list
))
182 die("git upload-pack: unable to fork git-rev-list");
185 FILE *pipe_fd
= xfdopen(pack_objects
.in
, "w");
188 for (i
= 0; i
< want_obj
.nr
; i
++)
189 fprintf(pipe_fd
, "%s\n",
190 sha1_to_hex(want_obj
.objects
[i
].item
->sha1
));
191 fprintf(pipe_fd
, "--not\n");
192 for (i
= 0; i
< have_obj
.nr
; i
++)
193 fprintf(pipe_fd
, "%s\n",
194 sha1_to_hex(have_obj
.objects
[i
].item
->sha1
));
195 fprintf(pipe_fd
, "\n");
201 /* We read from pack_objects.err to capture stderr output for
202 * progress bar, and pack_objects.out to capture the pack data.
206 struct pollfd pfd
[2];
207 int pe
, pu
, pollsize
;
214 if (0 <= pack_objects
.out
) {
215 pfd
[pollsize
].fd
= pack_objects
.out
;
216 pfd
[pollsize
].events
= POLLIN
;
220 if (0 <= pack_objects
.err
) {
221 pfd
[pollsize
].fd
= pack_objects
.err
;
222 pfd
[pollsize
].events
= POLLIN
;
230 if (poll(pfd
, pollsize
, -1) < 0) {
231 if (errno
!= EINTR
) {
232 error("poll failed, resuming: %s",
238 if (0 <= pe
&& (pfd
[pe
].revents
& (POLLIN
|POLLHUP
))) {
239 /* Status ready; we ship that in the side-band
240 * or dump to the standard error.
242 sz
= xread(pack_objects
.err
, progress
,
245 send_client_data(2, progress
, sz
);
247 close(pack_objects
.err
);
248 pack_objects
.err
= -1;
252 /* give priority to status messages */
255 if (0 <= pu
&& (pfd
[pu
].revents
& (POLLIN
|POLLHUP
))) {
256 /* Data ready; we keep the last byte to ourselves
257 * in case we detect broken rev-list, so that we
258 * can leave the stream corrupted. This is
259 * unfortunate -- unpack-objects would happily
260 * accept a valid packdata with trailing garbage,
261 * so appending garbage after we pass all the
262 * pack data is not good enough to signal
263 * breakage to downstream.
271 sz
= xread(pack_objects
.out
, cp
,
272 sizeof(data
) - outsz
);
276 close(pack_objects
.out
);
277 pack_objects
.out
= -1;
283 buffered
= data
[sz
-1] & 0xFF;
288 sz
= send_client_data(1, data
, sz
);
294 if (finish_command(&pack_objects
)) {
295 error("git upload-pack: git-pack-objects died with error.");
298 if (shallow_nr
&& finish_async(&rev_list
))
299 goto fail
; /* error was already reported */
304 sz
= send_client_data(1, data
, 1);
307 fprintf(stderr
, "flushed.\n");
314 send_client_data(3, abort_msg
, sizeof(abort_msg
));
315 die("git upload-pack: %s", abort_msg
);
318 static int got_sha1(char *hex
, unsigned char *sha1
)
321 int we_knew_they_have
= 0;
323 if (get_sha1_hex(hex
, sha1
))
324 die("git upload-pack: expected SHA1 object, got '%s'", hex
);
325 if (!has_sha1_file(sha1
))
328 o
= lookup_object(sha1
);
329 if (!(o
&& o
->parsed
))
330 o
= parse_object(sha1
);
332 die("oops (%s)", sha1_to_hex(sha1
));
333 if (o
->type
== OBJ_COMMIT
) {
334 struct commit_list
*parents
;
335 struct commit
*commit
= (struct commit
*)o
;
336 if (o
->flags
& THEY_HAVE
)
337 we_knew_they_have
= 1;
339 o
->flags
|= THEY_HAVE
;
340 if (!oldest_have
|| (commit
->date
< oldest_have
))
341 oldest_have
= commit
->date
;
342 for (parents
= commit
->parents
;
344 parents
= parents
->next
)
345 parents
->item
->object
.flags
|= THEY_HAVE
;
347 if (!we_knew_they_have
) {
348 add_object_array(o
, NULL
, &have_obj
);
354 static int reachable(struct commit
*want
)
356 struct commit_list
*work
= NULL
;
358 commit_list_insert_by_date(want
, &work
);
360 struct commit_list
*list
= work
->next
;
361 struct commit
*commit
= work
->item
;
365 if (commit
->object
.flags
& THEY_HAVE
) {
366 want
->object
.flags
|= COMMON_KNOWN
;
369 if (!commit
->object
.parsed
)
370 parse_object(commit
->object
.sha1
);
371 if (commit
->object
.flags
& REACHABLE
)
373 commit
->object
.flags
|= REACHABLE
;
374 if (commit
->date
< oldest_have
)
376 for (list
= commit
->parents
; list
; list
= list
->next
) {
377 struct commit
*parent
= list
->item
;
378 if (!(parent
->object
.flags
& REACHABLE
))
379 commit_list_insert_by_date(parent
, &work
);
382 want
->object
.flags
|= REACHABLE
;
383 clear_commit_marks(want
, REACHABLE
);
384 free_commit_list(work
);
385 return (want
->object
.flags
& COMMON_KNOWN
);
388 static int ok_to_give_up(void)
395 for (i
= 0; i
< want_obj
.nr
; i
++) {
396 struct object
*want
= want_obj
.objects
[i
].item
;
398 if (want
->flags
& COMMON_KNOWN
)
400 want
= deref_tag(want
, "a want line", 0);
401 if (!want
|| want
->type
!= OBJ_COMMIT
) {
402 /* no way to tell if this is reachable by
403 * looking at the ancestry chain alone, so
404 * leave a note to ourselves not to worry about
405 * this object anymore.
407 want_obj
.objects
[i
].item
->flags
|= COMMON_KNOWN
;
410 if (!reachable((struct commit
*)want
))
416 static int get_common_commits(void)
418 static char line
[1000];
419 unsigned char sha1
[20];
425 save_commit_buffer
= 0;
428 int len
= packet_read_line(0, line
, sizeof(line
));
432 if (multi_ack
== 2 && got_common
433 && !got_other
&& ok_to_give_up()) {
435 packet_write(1, "ACK %s ready\n", last_hex
);
437 if (have_obj
.nr
== 0 || multi_ack
)
438 packet_write(1, "NAK\n");
440 if (no_done
&& sent_ready
) {
441 packet_write(1, "ACK %s\n", last_hex
);
451 if (!prefixcmp(line
, "have ")) {
452 switch (got_sha1(line
+5, sha1
)) {
453 case -1: /* they have what we do not */
455 if (multi_ack
&& ok_to_give_up()) {
456 const char *hex
= sha1_to_hex(sha1
);
457 if (multi_ack
== 2) {
459 packet_write(1, "ACK %s ready\n", hex
);
461 packet_write(1, "ACK %s continue\n", hex
);
466 memcpy(last_hex
, sha1_to_hex(sha1
), 41);
468 packet_write(1, "ACK %s common\n", last_hex
);
470 packet_write(1, "ACK %s continue\n", last_hex
);
471 else if (have_obj
.nr
== 1)
472 packet_write(1, "ACK %s\n", last_hex
);
477 if (!strcmp(line
, "done")) {
478 if (have_obj
.nr
> 0) {
480 packet_write(1, "ACK %s\n", last_hex
);
483 packet_write(1, "NAK\n");
486 die("git upload-pack: expected SHA1 list, got '%s'", line
);
490 static void check_non_tip(void)
492 static const char *argv
[] = {
493 "rev-list", "--stdin", NULL
,
495 static struct child_process cmd
;
497 char namebuf
[42]; /* ^ + SHA-1 + LF */
500 /* In the normal in-process case non-tip request can never happen */
510 if (start_command(&cmd
))
514 * If rev-list --stdin encounters an unknown commit, it
515 * terminates, which will cause SIGPIPE in the write loop
518 sigchain_push(SIGPIPE
, SIG_IGN
);
522 for (i
= get_max_object_index(); 0 < i
; ) {
523 o
= get_indexed_object(--i
);
526 if (!(o
->flags
& OUR_REF
))
528 memcpy(namebuf
+ 1, sha1_to_hex(o
->sha1
), 40);
529 if (write_in_full(cmd
.in
, namebuf
, 42) < 0)
533 for (i
= 0; i
< want_obj
.nr
; i
++) {
534 o
= want_obj
.objects
[i
].item
;
535 if (o
->flags
& OUR_REF
)
537 memcpy(namebuf
, sha1_to_hex(o
->sha1
), 40);
538 if (write_in_full(cmd
.in
, namebuf
, 41) < 0)
543 sigchain_pop(SIGPIPE
);
546 * The commits out of the rev-list are not ancestors of
549 i
= read_in_full(cmd
.out
, namebuf
, 1);
555 * rev-list may have died by encountering a bad commit
556 * in the history, in which case we do want to bail out
557 * even when it showed no commit.
559 if (finish_command(&cmd
))
562 /* All the non-tip ones are ancestors of what we advertised */
566 /* Pick one of them (we know there at least is one) */
567 for (i
= 0; i
< want_obj
.nr
; i
++) {
568 o
= want_obj
.objects
[i
].item
;
569 if (!(o
->flags
& OUR_REF
))
570 die("git upload-pack: not our ref %s",
571 sha1_to_hex(o
->sha1
));
575 static void receive_needs(void)
577 struct object_array shallows
= OBJECT_ARRAY_INIT
;
578 static char line
[1000];
584 write_str_in_full(debug_fd
, "#S\n");
587 const char *features
;
588 unsigned char sha1_buf
[20];
589 len
= packet_read_line(0, line
, sizeof(line
));
594 write_in_full(debug_fd
, line
, len
);
596 if (!prefixcmp(line
, "shallow ")) {
597 unsigned char sha1
[20];
598 struct object
*object
;
599 if (get_sha1(line
+ 8, sha1
))
600 die("invalid shallow line: %s", line
);
601 object
= parse_object(sha1
);
603 die("did not find object for %s", line
);
604 if (object
->type
!= OBJ_COMMIT
)
605 die("invalid shallow object %s", sha1_to_hex(sha1
));
606 object
->flags
|= CLIENT_SHALLOW
;
607 add_object_array(object
, NULL
, &shallows
);
610 if (!prefixcmp(line
, "deepen ")) {
612 depth
= strtol(line
+ 7, &end
, 0);
613 if (end
== line
+ 7 || depth
<= 0)
614 die("Invalid deepen: %s", line
);
617 if (prefixcmp(line
, "want ") ||
618 get_sha1_hex(line
+5, sha1_buf
))
619 die("git upload-pack: protocol error, "
620 "expected to get sha, not '%s'", line
);
622 features
= line
+ 45;
624 if (parse_feature_request(features
, "multi_ack_detailed"))
626 else if (parse_feature_request(features
, "multi_ack"))
628 if (parse_feature_request(features
, "no-done"))
630 if (parse_feature_request(features
, "thin-pack"))
632 if (parse_feature_request(features
, "ofs-delta"))
634 if (parse_feature_request(features
, "side-band-64k"))
635 use_sideband
= LARGE_PACKET_MAX
;
636 else if (parse_feature_request(features
, "side-band"))
637 use_sideband
= DEFAULT_PACKET_MAX
;
638 if (parse_feature_request(features
, "no-progress"))
640 if (parse_feature_request(features
, "include-tag"))
643 o
= lookup_object(sha1_buf
);
645 die("git upload-pack: not our ref %s",
646 sha1_to_hex(sha1_buf
));
647 if (!(o
->flags
& WANTED
)) {
649 if (!(o
->flags
& OUR_REF
))
651 add_object_array(o
, NULL
, &want_obj
);
655 write_str_in_full(debug_fd
, "#E\n");
658 * We have sent all our refs already, and the other end
659 * should have chosen out of them. When we are operating
660 * in the stateless RPC mode, however, their choice may
661 * have been based on the set of older refs advertised
662 * by another process that handled the initial request.
667 if (!use_sideband
&& daemon_mode
)
670 if (depth
== 0 && shallows
.nr
== 0)
673 struct commit_list
*result
= NULL
, *backup
= NULL
;
675 if (depth
== INFINITE_DEPTH
)
676 for (i
= 0; i
< shallows
.nr
; i
++) {
677 struct object
*object
= shallows
.objects
[i
].item
;
678 object
->flags
|= NOT_SHALLOW
;
682 get_shallow_commits(&want_obj
, depth
,
683 SHALLOW
, NOT_SHALLOW
);
685 struct object
*object
= &result
->item
->object
;
686 if (!(object
->flags
& (CLIENT_SHALLOW
|NOT_SHALLOW
))) {
687 packet_write(1, "shallow %s",
688 sha1_to_hex(object
->sha1
));
689 register_shallow(object
->sha1
);
692 result
= result
->next
;
694 free_commit_list(backup
);
695 for (i
= 0; i
< shallows
.nr
; i
++) {
696 struct object
*object
= shallows
.objects
[i
].item
;
697 if (object
->flags
& NOT_SHALLOW
) {
698 struct commit_list
*parents
;
699 packet_write(1, "unshallow %s",
700 sha1_to_hex(object
->sha1
));
701 object
->flags
&= ~CLIENT_SHALLOW
;
702 /* make sure the real parents are parsed */
703 unregister_shallow(object
->sha1
);
705 if (parse_commit((struct commit
*)object
))
706 die("invalid commit");
707 parents
= ((struct commit
*)object
)->parents
;
709 add_object_array(&parents
->item
->object
,
711 parents
= parents
->next
;
713 add_object_array(object
, NULL
, &extra_edge_obj
);
715 /* make sure commit traversal conforms to client */
716 register_shallow(object
->sha1
);
720 if (shallows
.nr
> 0) {
722 for (i
= 0; i
< shallows
.nr
; i
++)
723 register_shallow(shallows
.objects
[i
].item
->sha1
);
726 shallow_nr
+= shallows
.nr
;
727 free(shallows
.objects
);
730 /* return non-zero if the ref is hidden, otherwise 0 */
731 static int mark_our_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
733 struct object
*o
= lookup_unknown_object(sha1
);
735 if (ref_is_hidden(refname
))
738 die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1
));
743 static int send_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
745 static const char *capabilities
= "multi_ack thin-pack side-band"
746 " side-band-64k ofs-delta shallow no-progress"
747 " include-tag multi_ack_detailed";
748 const char *refname_nons
= strip_namespace(refname
);
749 unsigned char peeled
[20];
751 if (mark_our_ref(refname
, sha1
, flag
, cb_data
))
755 packet_write(1, "%s %s%c%s%s agent=%s\n",
756 sha1_to_hex(sha1
), refname_nons
,
758 stateless_rpc
? " no-done" : "",
759 git_user_agent_sanitized());
761 packet_write(1, "%s %s\n", sha1_to_hex(sha1
), refname_nons
);
763 if (!peel_ref(refname
, peeled
))
764 packet_write(1, "%s %s^{}\n", sha1_to_hex(peeled
), refname_nons
);
768 static void upload_pack(void)
770 if (advertise_refs
|| !stateless_rpc
) {
772 head_ref_namespaced(send_ref
, NULL
);
773 for_each_namespaced_ref(send_ref
, NULL
);
776 head_ref_namespaced(mark_our_ref
, NULL
);
777 for_each_namespaced_ref(mark_our_ref
, NULL
);
784 get_common_commits();
789 static int upload_pack_config(const char *var
, const char *value
, void *unused
)
791 return parse_hide_refs_config(var
, value
, "uploadpack");
794 int main(int argc
, char **argv
)
802 packet_trace_identity("upload-pack");
803 git_extract_argv0_path(argv
[0]);
804 read_replace_refs
= 0;
806 for (i
= 1; i
< argc
; i
++) {
811 if (!strcmp(arg
, "--advertise-refs")) {
815 if (!strcmp(arg
, "--stateless-rpc")) {
819 if (!strcmp(arg
, "--strict")) {
823 if (!prefixcmp(arg
, "--timeout=")) {
824 timeout
= atoi(arg
+10);
828 if (!strcmp(arg
, "--")) {
835 usage(upload_pack_usage
);
841 if (!enter_repo(dir
, strict
))
842 die("'%s' does not appear to be a git repository", dir
);
843 if (is_repository_shallow())
844 die("attempt to fetch/clone from a shallow repository");
845 git_config(upload_pack_config
, NULL
);
846 if (getenv("GIT_DEBUG_SEND_PACK"))
847 debug_fd
= atoi(getenv("GIT_DEBUG_SEND_PACK"));