11 #include "list-objects.h"
12 #include "run-command.h"
15 static const char upload_pack_usage
[] = "git upload-pack [--strict] [--timeout=<n>] <dir>";
17 /* bits #0..7 in revision.h, #8..10 in commit.c */
18 #define THEY_HAVE (1u << 11)
19 #define OUR_REF (1u << 12)
20 #define WANTED (1u << 13)
21 #define COMMON_KNOWN (1u << 14)
22 #define REACHABLE (1u << 15)
24 #define SHALLOW (1u << 16)
25 #define NOT_SHALLOW (1u << 17)
26 #define CLIENT_SHALLOW (1u << 18)
28 static unsigned long oldest_have
;
30 static int multi_ack
, nr_our_refs
;
32 static int use_thin_pack
, use_ofs_delta
, use_include_tag
;
33 static int no_progress
, daemon_mode
;
34 static int shallow_nr
;
35 static struct object_array have_obj
;
36 static struct object_array want_obj
;
37 static struct object_array extra_edge_obj
;
38 static unsigned int timeout
;
40 * otherwise maximum packet size (up to 65520 bytes).
42 static int use_sideband
;
44 static int advertise_refs
;
45 static int stateless_rpc
;
47 static void reset_timeout(void)
52 static int strip(char *line
, int len
)
54 if (len
&& line
[len
-1] == '\n')
59 static ssize_t
send_client_data(int fd
, const char *data
, ssize_t sz
)
62 return send_sideband(1, fd
, data
, sz
, use_sideband
);
67 /* XXX: are we happy to lose stuff here? */
71 return safe_write(fd
, data
, sz
);
74 static FILE *pack_pipe
= NULL
;
75 static void show_commit(struct commit
*commit
, void *data
)
77 if (commit
->object
.flags
& BOUNDARY
)
78 fputc('-', pack_pipe
);
79 if (fputs(sha1_to_hex(commit
->object
.sha1
), pack_pipe
) < 0)
80 die("broken output pipe");
81 fputc('\n', pack_pipe
);
84 commit
->buffer
= NULL
;
87 static void show_object(struct object
*obj
,
88 const struct name_path
*path
, const char *component
,
91 show_object_with_name(pack_pipe
, obj
, path
, component
);
94 static void show_edge(struct commit
*commit
)
96 fprintf(pack_pipe
, "-%s\n", sha1_to_hex(commit
->object
.sha1
));
99 static int do_rev_list(int in
, int out
, void *user_data
)
102 struct rev_info revs
;
104 pack_pipe
= xfdopen(out
, "w");
105 init_revisions(&revs
, NULL
);
106 revs
.tag_objects
= 1;
107 revs
.tree_objects
= 1;
108 revs
.blob_objects
= 1;
112 for (i
= 0; i
< want_obj
.nr
; i
++) {
113 struct object
*o
= want_obj
.objects
[i
].item
;
115 o
->flags
&= ~UNINTERESTING
;
116 add_pending_object(&revs
, o
, NULL
);
118 for (i
= 0; i
< have_obj
.nr
; i
++) {
119 struct object
*o
= have_obj
.objects
[i
].item
;
120 o
->flags
|= UNINTERESTING
;
121 add_pending_object(&revs
, o
, NULL
);
123 setup_revisions(0, NULL
, &revs
, NULL
);
124 if (prepare_revision_walk(&revs
))
125 die("revision walk setup failed");
126 mark_edges_uninteresting(revs
.commits
, &revs
, show_edge
);
128 for (i
= 0; i
< extra_edge_obj
.nr
; i
++)
129 fprintf(pack_pipe
, "-%s\n", sha1_to_hex(
130 extra_edge_obj
.objects
[i
].item
->sha1
));
131 traverse_commit_list(&revs
, show_commit
, show_object
, NULL
);
137 static void create_pack_file(void)
139 struct async rev_list
;
140 struct child_process pack_objects
;
141 int create_full_pack
= (nr_our_refs
== want_obj
.nr
&& !have_obj
.nr
);
142 char data
[8193], progress
[128];
143 char abort_msg
[] = "aborting due to possible repository "
144 "corruption on the remote side.";
147 const char *argv
[10];
150 argv
[arg
++] = "pack-objects";
152 argv
[arg
++] = "--revs";
153 if (create_full_pack
)
154 argv
[arg
++] = "--all";
155 else if (use_thin_pack
)
156 argv
[arg
++] = "--thin";
159 argv
[arg
++] = "--stdout";
161 argv
[arg
++] = "--progress";
163 argv
[arg
++] = "--delta-base-offset";
165 argv
[arg
++] = "--include-tag";
168 memset(&pack_objects
, 0, sizeof(pack_objects
));
169 pack_objects
.in
= -1;
170 pack_objects
.out
= -1;
171 pack_objects
.err
= -1;
172 pack_objects
.git_cmd
= 1;
173 pack_objects
.argv
= argv
;
175 if (start_command(&pack_objects
))
176 die("git upload-pack: unable to fork git-pack-objects");
179 memset(&rev_list
, 0, sizeof(rev_list
));
180 rev_list
.proc
= do_rev_list
;
181 rev_list
.out
= pack_objects
.in
;
182 if (start_async(&rev_list
))
183 die("git upload-pack: unable to fork git-rev-list");
186 FILE *pipe_fd
= xfdopen(pack_objects
.in
, "w");
187 if (!create_full_pack
) {
189 for (i
= 0; i
< want_obj
.nr
; i
++)
190 fprintf(pipe_fd
, "%s\n", 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", sha1_to_hex(have_obj
.objects
[i
].item
->sha1
));
196 fprintf(pipe_fd
, "\n");
202 /* We read from pack_objects.err to capture stderr output for
203 * progress bar, and pack_objects.out to capture the pack data.
207 struct pollfd pfd
[2];
208 int pe
, pu
, pollsize
;
215 if (0 <= pack_objects
.out
) {
216 pfd
[pollsize
].fd
= pack_objects
.out
;
217 pfd
[pollsize
].events
= POLLIN
;
221 if (0 <= pack_objects
.err
) {
222 pfd
[pollsize
].fd
= pack_objects
.err
;
223 pfd
[pollsize
].events
= POLLIN
;
231 if (poll(pfd
, pollsize
, -1) < 0) {
232 if (errno
!= EINTR
) {
233 error("poll failed, resuming: %s",
239 if (0 <= pe
&& (pfd
[pe
].revents
& (POLLIN
|POLLHUP
))) {
240 /* Status ready; we ship that in the side-band
241 * or dump to the standard error.
243 sz
= xread(pack_objects
.err
, progress
,
246 send_client_data(2, progress
, sz
);
248 close(pack_objects
.err
);
249 pack_objects
.err
= -1;
253 /* give priority to status messages */
256 if (0 <= pu
&& (pfd
[pu
].revents
& (POLLIN
|POLLHUP
))) {
257 /* Data ready; we keep the last byte to ourselves
258 * in case we detect broken rev-list, so that we
259 * can leave the stream corrupted. This is
260 * unfortunate -- unpack-objects would happily
261 * accept a valid packdata with trailing garbage,
262 * so appending garbage after we pass all the
263 * pack data is not good enough to signal
264 * breakage to downstream.
272 sz
= xread(pack_objects
.out
, cp
,
273 sizeof(data
) - outsz
);
277 close(pack_objects
.out
);
278 pack_objects
.out
= -1;
284 buffered
= data
[sz
-1] & 0xFF;
289 sz
= send_client_data(1, data
, sz
);
295 if (finish_command(&pack_objects
)) {
296 error("git upload-pack: git-pack-objects died with error.");
299 if (shallow_nr
&& finish_async(&rev_list
))
300 goto fail
; /* error was already reported */
305 sz
= send_client_data(1, data
, 1);
308 fprintf(stderr
, "flushed.\n");
315 send_client_data(3, abort_msg
, sizeof(abort_msg
));
316 die("git upload-pack: %s", abort_msg
);
319 static int got_sha1(char *hex
, unsigned char *sha1
)
322 int we_knew_they_have
= 0;
324 if (get_sha1_hex(hex
, sha1
))
325 die("git upload-pack: expected SHA1 object, got '%s'", hex
);
326 if (!has_sha1_file(sha1
))
329 o
= lookup_object(sha1
);
330 if (!(o
&& o
->parsed
))
331 o
= parse_object(sha1
);
333 die("oops (%s)", sha1_to_hex(sha1
));
334 if (o
->type
== OBJ_COMMIT
) {
335 struct commit_list
*parents
;
336 struct commit
*commit
= (struct commit
*)o
;
337 if (o
->flags
& THEY_HAVE
)
338 we_knew_they_have
= 1;
340 o
->flags
|= THEY_HAVE
;
341 if (!oldest_have
|| (commit
->date
< oldest_have
))
342 oldest_have
= commit
->date
;
343 for (parents
= commit
->parents
;
345 parents
= parents
->next
)
346 parents
->item
->object
.flags
|= THEY_HAVE
;
348 if (!we_knew_they_have
) {
349 add_object_array(o
, NULL
, &have_obj
);
355 static int reachable(struct commit
*want
)
357 struct commit_list
*work
= NULL
;
359 commit_list_insert_by_date(want
, &work
);
361 struct commit_list
*list
= work
->next
;
362 struct commit
*commit
= work
->item
;
366 if (commit
->object
.flags
& THEY_HAVE
) {
367 want
->object
.flags
|= COMMON_KNOWN
;
370 if (!commit
->object
.parsed
)
371 parse_object(commit
->object
.sha1
);
372 if (commit
->object
.flags
& REACHABLE
)
374 commit
->object
.flags
|= REACHABLE
;
375 if (commit
->date
< oldest_have
)
377 for (list
= commit
->parents
; list
; list
= list
->next
) {
378 struct commit
*parent
= list
->item
;
379 if (!(parent
->object
.flags
& REACHABLE
))
380 commit_list_insert_by_date(parent
, &work
);
383 want
->object
.flags
|= REACHABLE
;
384 clear_commit_marks(want
, REACHABLE
);
385 free_commit_list(work
);
386 return (want
->object
.flags
& COMMON_KNOWN
);
389 static int ok_to_give_up(void)
396 for (i
= 0; i
< want_obj
.nr
; i
++) {
397 struct object
*want
= want_obj
.objects
[i
].item
;
399 if (want
->flags
& COMMON_KNOWN
)
401 want
= deref_tag(want
, "a want line", 0);
402 if (!want
|| want
->type
!= OBJ_COMMIT
) {
403 /* no way to tell if this is reachable by
404 * looking at the ancestry chain alone, so
405 * leave a note to ourselves not to worry about
406 * this object anymore.
408 want_obj
.objects
[i
].item
->flags
|= COMMON_KNOWN
;
411 if (!reachable((struct commit
*)want
))
417 static int get_common_commits(void)
419 static char line
[1000];
420 unsigned char sha1
[20];
426 save_commit_buffer
= 0;
429 int len
= packet_read_line(0, line
, sizeof(line
));
433 if (multi_ack
== 2 && got_common
434 && !got_other
&& ok_to_give_up()) {
436 packet_write(1, "ACK %s ready\n", last_hex
);
438 if (have_obj
.nr
== 0 || multi_ack
)
439 packet_write(1, "NAK\n");
441 if (no_done
&& sent_ready
) {
442 packet_write(1, "ACK %s\n", last_hex
);
452 if (!prefixcmp(line
, "have ")) {
453 switch (got_sha1(line
+5, sha1
)) {
454 case -1: /* they have what we do not */
456 if (multi_ack
&& ok_to_give_up()) {
457 const char *hex
= sha1_to_hex(sha1
);
458 if (multi_ack
== 2) {
460 packet_write(1, "ACK %s ready\n", hex
);
462 packet_write(1, "ACK %s continue\n", hex
);
467 memcpy(last_hex
, sha1_to_hex(sha1
), 41);
469 packet_write(1, "ACK %s common\n", last_hex
);
471 packet_write(1, "ACK %s continue\n", last_hex
);
472 else if (have_obj
.nr
== 1)
473 packet_write(1, "ACK %s\n", last_hex
);
478 if (!strcmp(line
, "done")) {
479 if (have_obj
.nr
> 0) {
481 packet_write(1, "ACK %s\n", last_hex
);
484 packet_write(1, "NAK\n");
487 die("git upload-pack: expected SHA1 list, got '%s'", line
);
491 static void check_non_tip(void)
493 static const char *argv
[] = {
494 "rev-list", "--stdin", NULL
,
496 static struct child_process cmd
;
498 char namebuf
[42]; /* ^ + SHA-1 + LF */
501 /* In the normal in-process case non-tip request can never happen */
511 if (start_command(&cmd
))
515 * If rev-list --stdin encounters an unknown commit, it
516 * terminates, which will cause SIGPIPE in the write loop
519 sigchain_push(SIGPIPE
, SIG_IGN
);
523 for (i
= get_max_object_index(); 0 < i
; ) {
524 o
= get_indexed_object(--i
);
527 if (!(o
->flags
& OUR_REF
))
529 memcpy(namebuf
+ 1, sha1_to_hex(o
->sha1
), 40);
530 if (write_in_full(cmd
.in
, namebuf
, 42) < 0)
534 for (i
= 0; i
< want_obj
.nr
; i
++) {
535 o
= want_obj
.objects
[i
].item
;
536 if (o
->flags
& OUR_REF
)
538 memcpy(namebuf
, sha1_to_hex(o
->sha1
), 40);
539 if (write_in_full(cmd
.in
, namebuf
, 41) < 0)
544 sigchain_pop(SIGPIPE
);
547 * The commits out of the rev-list are not ancestors of
550 i
= read_in_full(cmd
.out
, namebuf
, 1);
556 * rev-list may have died by encountering a bad commit
557 * in the history, in which case we do want to bail out
558 * even when it showed no commit.
560 if (finish_command(&cmd
))
563 /* All the non-tip ones are ancestors of what we advertised */
567 /* Pick one of them (we know there at least is one) */
568 for (i
= 0; i
< want_obj
.nr
; i
++) {
569 o
= want_obj
.objects
[i
].item
;
570 if (!(o
->flags
& OUR_REF
))
571 die("git upload-pack: not our ref %s",
572 sha1_to_hex(o
->sha1
));
576 static void receive_needs(void)
578 struct object_array shallows
= OBJECT_ARRAY_INIT
;
579 static char line
[1000];
585 write_str_in_full(debug_fd
, "#S\n");
588 const char *features
;
589 unsigned char sha1_buf
[20];
590 len
= packet_read_line(0, line
, sizeof(line
));
595 write_in_full(debug_fd
, line
, len
);
597 if (!prefixcmp(line
, "shallow ")) {
598 unsigned char sha1
[20];
599 struct object
*object
;
600 if (get_sha1(line
+ 8, sha1
))
601 die("invalid shallow line: %s", line
);
602 object
= parse_object(sha1
);
604 die("did not find object for %s", line
);
605 object
->flags
|= CLIENT_SHALLOW
;
606 add_object_array(object
, NULL
, &shallows
);
609 if (!prefixcmp(line
, "deepen ")) {
611 depth
= strtol(line
+ 7, &end
, 0);
612 if (end
== line
+ 7 || depth
<= 0)
613 die("Invalid deepen: %s", line
);
616 if (prefixcmp(line
, "want ") ||
617 get_sha1_hex(line
+5, sha1_buf
))
618 die("git upload-pack: protocol error, "
619 "expected to get sha, not '%s'", line
);
621 features
= line
+ 45;
623 if (parse_feature_request(features
, "multi_ack_detailed"))
625 else if (parse_feature_request(features
, "multi_ack"))
627 if (parse_feature_request(features
, "no-done"))
629 if (parse_feature_request(features
, "thin-pack"))
631 if (parse_feature_request(features
, "ofs-delta"))
633 if (parse_feature_request(features
, "side-band-64k"))
634 use_sideband
= LARGE_PACKET_MAX
;
635 else if (parse_feature_request(features
, "side-band"))
636 use_sideband
= DEFAULT_PACKET_MAX
;
637 if (parse_feature_request(features
, "no-progress"))
639 if (parse_feature_request(features
, "include-tag"))
642 o
= lookup_object(sha1_buf
);
644 die("git upload-pack: not our ref %s",
645 sha1_to_hex(sha1_buf
));
646 if (!(o
->flags
& WANTED
)) {
648 if (!(o
->flags
& OUR_REF
))
650 add_object_array(o
, NULL
, &want_obj
);
654 write_str_in_full(debug_fd
, "#E\n");
657 * We have sent all our refs already, and the other end
658 * should have chosen out of them. When we are operating
659 * in the stateless RPC mode, however, their choice may
660 * have been based on the set of older refs advertised
661 * by another process that handled the initial request.
666 if (!use_sideband
&& daemon_mode
)
669 if (depth
== 0 && shallows
.nr
== 0)
672 struct commit_list
*result
, *backup
;
674 backup
= result
= get_shallow_commits(&want_obj
, depth
,
675 SHALLOW
, NOT_SHALLOW
);
677 struct object
*object
= &result
->item
->object
;
678 if (!(object
->flags
& (CLIENT_SHALLOW
|NOT_SHALLOW
))) {
679 packet_write(1, "shallow %s",
680 sha1_to_hex(object
->sha1
));
681 register_shallow(object
->sha1
);
684 result
= result
->next
;
686 free_commit_list(backup
);
687 for (i
= 0; i
< shallows
.nr
; i
++) {
688 struct object
*object
= shallows
.objects
[i
].item
;
689 if (object
->flags
& NOT_SHALLOW
) {
690 struct commit_list
*parents
;
691 packet_write(1, "unshallow %s",
692 sha1_to_hex(object
->sha1
));
693 object
->flags
&= ~CLIENT_SHALLOW
;
694 /* make sure the real parents are parsed */
695 unregister_shallow(object
->sha1
);
697 if (parse_commit((struct commit
*)object
))
698 die("invalid commit");
699 parents
= ((struct commit
*)object
)->parents
;
701 add_object_array(&parents
->item
->object
,
703 parents
= parents
->next
;
705 add_object_array(object
, NULL
, &extra_edge_obj
);
707 /* make sure commit traversal conforms to client */
708 register_shallow(object
->sha1
);
712 if (shallows
.nr
> 0) {
714 for (i
= 0; i
< shallows
.nr
; i
++)
715 register_shallow(shallows
.objects
[i
].item
->sha1
);
718 shallow_nr
+= shallows
.nr
;
719 free(shallows
.objects
);
722 static int send_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
724 static const char *capabilities
= "multi_ack thin-pack side-band"
725 " side-band-64k ofs-delta shallow no-progress"
726 " include-tag multi_ack_detailed";
727 struct object
*o
= parse_object(sha1
);
728 const char *refname_nons
= strip_namespace(refname
);
731 die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1
));
734 packet_write(1, "%s %s%c%s%s\n", sha1_to_hex(sha1
), refname_nons
,
736 stateless_rpc
? " no-done" : "");
738 packet_write(1, "%s %s\n", sha1_to_hex(sha1
), refname_nons
);
740 if (!(o
->flags
& OUR_REF
)) {
744 if (o
->type
== OBJ_TAG
) {
745 o
= deref_tag(o
, refname
, 0);
747 packet_write(1, "%s %s^{}\n", sha1_to_hex(o
->sha1
), refname_nons
);
752 static int mark_our_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
754 struct object
*o
= parse_object(sha1
);
756 die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1
));
757 if (!(o
->flags
& OUR_REF
)) {
764 static void upload_pack(void)
766 if (advertise_refs
|| !stateless_rpc
) {
768 head_ref_namespaced(send_ref
, NULL
);
769 for_each_namespaced_ref(send_ref
, NULL
);
772 head_ref_namespaced(mark_our_ref
, NULL
);
773 for_each_namespaced_ref(mark_our_ref
, NULL
);
780 get_common_commits();
785 int main(int argc
, char **argv
)
793 packet_trace_identity("upload-pack");
794 git_extract_argv0_path(argv
[0]);
795 read_replace_refs
= 0;
797 for (i
= 1; i
< argc
; i
++) {
802 if (!strcmp(arg
, "--advertise-refs")) {
806 if (!strcmp(arg
, "--stateless-rpc")) {
810 if (!strcmp(arg
, "--strict")) {
814 if (!prefixcmp(arg
, "--timeout=")) {
815 timeout
= atoi(arg
+10);
819 if (!strcmp(arg
, "--")) {
826 usage(upload_pack_usage
);
832 if (!enter_repo(dir
, strict
))
833 die("'%s' does not appear to be a git repository", dir
);
834 if (is_repository_shallow())
835 die("attempt to fetch/clone from a shallow repository");
836 if (getenv("GIT_DEBUG_SEND_PACK"))
837 debug_fd
= atoi(getenv("GIT_DEBUG_SEND_PACK"));