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
, const struct name_path
*path
, const char *component
)
89 /* An object with name "foo\n0000000..." can be used to
90 * confuse downstream git-pack-objects very badly.
92 const char *name
= path_name(path
, component
);
93 const char *ep
= strchr(name
, '\n');
95 fprintf(pack_pipe
, "%s %.*s\n", sha1_to_hex(obj
->sha1
),
100 fprintf(pack_pipe
, "%s %s\n",
101 sha1_to_hex(obj
->sha1
), name
);
105 static void show_edge(struct commit
*commit
)
107 fprintf(pack_pipe
, "-%s\n", sha1_to_hex(commit
->object
.sha1
));
110 static int do_rev_list(int in
, int out
, void *user_data
)
113 struct rev_info revs
;
115 pack_pipe
= xfdopen(out
, "w");
116 init_revisions(&revs
, NULL
);
117 revs
.tag_objects
= 1;
118 revs
.tree_objects
= 1;
119 revs
.blob_objects
= 1;
123 for (i
= 0; i
< want_obj
.nr
; i
++) {
124 struct object
*o
= want_obj
.objects
[i
].item
;
126 o
->flags
&= ~UNINTERESTING
;
127 add_pending_object(&revs
, o
, NULL
);
129 for (i
= 0; i
< have_obj
.nr
; i
++) {
130 struct object
*o
= have_obj
.objects
[i
].item
;
131 o
->flags
|= UNINTERESTING
;
132 add_pending_object(&revs
, o
, NULL
);
134 setup_revisions(0, NULL
, &revs
, NULL
);
135 if (prepare_revision_walk(&revs
))
136 die("revision walk setup failed");
137 mark_edges_uninteresting(revs
.commits
, &revs
, show_edge
);
139 for (i
= 0; i
< extra_edge_obj
.nr
; i
++)
140 fprintf(pack_pipe
, "-%s\n", sha1_to_hex(
141 extra_edge_obj
.objects
[i
].item
->sha1
));
142 traverse_commit_list(&revs
, show_commit
, show_object
, NULL
);
148 static void create_pack_file(void)
150 struct async rev_list
;
151 struct child_process pack_objects
;
152 int create_full_pack
= (nr_our_refs
== want_obj
.nr
&& !have_obj
.nr
);
153 char data
[8193], progress
[128];
154 char abort_msg
[] = "aborting due to possible repository "
155 "corruption on the remote side.";
158 const char *argv
[10];
161 argv
[arg
++] = "pack-objects";
163 argv
[arg
++] = "--revs";
164 if (create_full_pack
)
165 argv
[arg
++] = "--all";
166 else if (use_thin_pack
)
167 argv
[arg
++] = "--thin";
170 argv
[arg
++] = "--stdout";
172 argv
[arg
++] = "--progress";
174 argv
[arg
++] = "--delta-base-offset";
176 argv
[arg
++] = "--include-tag";
179 memset(&pack_objects
, 0, sizeof(pack_objects
));
180 pack_objects
.in
= -1;
181 pack_objects
.out
= -1;
182 pack_objects
.err
= -1;
183 pack_objects
.git_cmd
= 1;
184 pack_objects
.argv
= argv
;
186 if (start_command(&pack_objects
))
187 die("git upload-pack: unable to fork git-pack-objects");
190 memset(&rev_list
, 0, sizeof(rev_list
));
191 rev_list
.proc
= do_rev_list
;
192 rev_list
.out
= pack_objects
.in
;
193 if (start_async(&rev_list
))
194 die("git upload-pack: unable to fork git-rev-list");
197 FILE *pipe_fd
= xfdopen(pack_objects
.in
, "w");
198 if (!create_full_pack
) {
200 for (i
= 0; i
< want_obj
.nr
; i
++)
201 fprintf(pipe_fd
, "%s\n", sha1_to_hex(want_obj
.objects
[i
].item
->sha1
));
202 fprintf(pipe_fd
, "--not\n");
203 for (i
= 0; i
< have_obj
.nr
; i
++)
204 fprintf(pipe_fd
, "%s\n", sha1_to_hex(have_obj
.objects
[i
].item
->sha1
));
207 fprintf(pipe_fd
, "\n");
213 /* We read from pack_objects.err to capture stderr output for
214 * progress bar, and pack_objects.out to capture the pack data.
218 struct pollfd pfd
[2];
219 int pe
, pu
, pollsize
;
226 if (0 <= pack_objects
.out
) {
227 pfd
[pollsize
].fd
= pack_objects
.out
;
228 pfd
[pollsize
].events
= POLLIN
;
232 if (0 <= pack_objects
.err
) {
233 pfd
[pollsize
].fd
= pack_objects
.err
;
234 pfd
[pollsize
].events
= POLLIN
;
242 if (poll(pfd
, pollsize
, -1) < 0) {
243 if (errno
!= EINTR
) {
244 error("poll failed, resuming: %s",
250 if (0 <= pe
&& (pfd
[pe
].revents
& (POLLIN
|POLLHUP
))) {
251 /* Status ready; we ship that in the side-band
252 * or dump to the standard error.
254 sz
= xread(pack_objects
.err
, progress
,
257 send_client_data(2, progress
, sz
);
259 close(pack_objects
.err
);
260 pack_objects
.err
= -1;
264 /* give priority to status messages */
267 if (0 <= pu
&& (pfd
[pu
].revents
& (POLLIN
|POLLHUP
))) {
268 /* Data ready; we keep the last byte to ourselves
269 * in case we detect broken rev-list, so that we
270 * can leave the stream corrupted. This is
271 * unfortunate -- unpack-objects would happily
272 * accept a valid packdata with trailing garbage,
273 * so appending garbage after we pass all the
274 * pack data is not good enough to signal
275 * breakage to downstream.
283 sz
= xread(pack_objects
.out
, cp
,
284 sizeof(data
) - outsz
);
288 close(pack_objects
.out
);
289 pack_objects
.out
= -1;
295 buffered
= data
[sz
-1] & 0xFF;
300 sz
= send_client_data(1, data
, sz
);
306 if (finish_command(&pack_objects
)) {
307 error("git upload-pack: git-pack-objects died with error.");
310 if (shallow_nr
&& finish_async(&rev_list
))
311 goto fail
; /* error was already reported */
316 sz
= send_client_data(1, data
, 1);
319 fprintf(stderr
, "flushed.\n");
326 send_client_data(3, abort_msg
, sizeof(abort_msg
));
327 die("git upload-pack: %s", abort_msg
);
330 static int got_sha1(char *hex
, unsigned char *sha1
)
333 int we_knew_they_have
= 0;
335 if (get_sha1_hex(hex
, sha1
))
336 die("git upload-pack: expected SHA1 object, got '%s'", hex
);
337 if (!has_sha1_file(sha1
))
340 o
= lookup_object(sha1
);
341 if (!(o
&& o
->parsed
))
342 o
= parse_object(sha1
);
344 die("oops (%s)", sha1_to_hex(sha1
));
345 if (o
->type
== OBJ_COMMIT
) {
346 struct commit_list
*parents
;
347 struct commit
*commit
= (struct commit
*)o
;
348 if (o
->flags
& THEY_HAVE
)
349 we_knew_they_have
= 1;
351 o
->flags
|= THEY_HAVE
;
352 if (!oldest_have
|| (commit
->date
< oldest_have
))
353 oldest_have
= commit
->date
;
354 for (parents
= commit
->parents
;
356 parents
= parents
->next
)
357 parents
->item
->object
.flags
|= THEY_HAVE
;
359 if (!we_knew_they_have
) {
360 add_object_array(o
, NULL
, &have_obj
);
366 static int reachable(struct commit
*want
)
368 struct commit_list
*work
= NULL
;
370 commit_list_insert_by_date(want
, &work
);
372 struct commit_list
*list
= work
->next
;
373 struct commit
*commit
= work
->item
;
377 if (commit
->object
.flags
& THEY_HAVE
) {
378 want
->object
.flags
|= COMMON_KNOWN
;
381 if (!commit
->object
.parsed
)
382 parse_object(commit
->object
.sha1
);
383 if (commit
->object
.flags
& REACHABLE
)
385 commit
->object
.flags
|= REACHABLE
;
386 if (commit
->date
< oldest_have
)
388 for (list
= commit
->parents
; list
; list
= list
->next
) {
389 struct commit
*parent
= list
->item
;
390 if (!(parent
->object
.flags
& REACHABLE
))
391 commit_list_insert_by_date(parent
, &work
);
394 want
->object
.flags
|= REACHABLE
;
395 clear_commit_marks(want
, REACHABLE
);
396 free_commit_list(work
);
397 return (want
->object
.flags
& COMMON_KNOWN
);
400 static int ok_to_give_up(void)
407 for (i
= 0; i
< want_obj
.nr
; i
++) {
408 struct object
*want
= want_obj
.objects
[i
].item
;
410 if (want
->flags
& COMMON_KNOWN
)
412 want
= deref_tag(want
, "a want line", 0);
413 if (!want
|| want
->type
!= OBJ_COMMIT
) {
414 /* no way to tell if this is reachable by
415 * looking at the ancestry chain alone, so
416 * leave a note to ourselves not to worry about
417 * this object anymore.
419 want_obj
.objects
[i
].item
->flags
|= COMMON_KNOWN
;
422 if (!reachable((struct commit
*)want
))
428 static int get_common_commits(void)
430 static char line
[1000];
431 unsigned char sha1
[20];
437 save_commit_buffer
= 0;
440 int len
= packet_read_line(0, line
, sizeof(line
));
444 if (multi_ack
== 2 && got_common
445 && !got_other
&& ok_to_give_up()) {
447 packet_write(1, "ACK %s ready\n", last_hex
);
449 if (have_obj
.nr
== 0 || multi_ack
)
450 packet_write(1, "NAK\n");
452 if (no_done
&& sent_ready
) {
453 packet_write(1, "ACK %s\n", last_hex
);
463 if (!prefixcmp(line
, "have ")) {
464 switch (got_sha1(line
+5, sha1
)) {
465 case -1: /* they have what we do not */
467 if (multi_ack
&& ok_to_give_up()) {
468 const char *hex
= sha1_to_hex(sha1
);
469 if (multi_ack
== 2) {
471 packet_write(1, "ACK %s ready\n", hex
);
473 packet_write(1, "ACK %s continue\n", hex
);
478 memcpy(last_hex
, sha1_to_hex(sha1
), 41);
480 packet_write(1, "ACK %s common\n", last_hex
);
482 packet_write(1, "ACK %s continue\n", last_hex
);
483 else if (have_obj
.nr
== 1)
484 packet_write(1, "ACK %s\n", last_hex
);
489 if (!strcmp(line
, "done")) {
490 if (have_obj
.nr
> 0) {
492 packet_write(1, "ACK %s\n", last_hex
);
495 packet_write(1, "NAK\n");
498 die("git upload-pack: expected SHA1 list, got '%s'", line
);
502 static void check_non_tip(void)
504 static const char *argv
[] = {
505 "rev-list", "--stdin", NULL
,
507 static struct child_process cmd
;
509 char namebuf
[42]; /* ^ + SHA-1 + LF */
512 /* In the normal in-process case non-tip request can never happen */
522 if (start_command(&cmd
))
526 * If rev-list --stdin encounters an unknown commit, it
527 * terminates, which will cause SIGPIPE in the write loop
530 sigchain_push(SIGPIPE
, SIG_IGN
);
534 for (i
= get_max_object_index(); 0 < i
; ) {
535 o
= get_indexed_object(--i
);
538 if (!(o
->flags
& OUR_REF
))
540 memcpy(namebuf
+ 1, sha1_to_hex(o
->sha1
), 40);
541 if (write_in_full(cmd
.in
, namebuf
, 42) < 0)
545 for (i
= 0; i
< want_obj
.nr
; i
++) {
546 o
= want_obj
.objects
[i
].item
;
547 if (o
->flags
& OUR_REF
)
549 memcpy(namebuf
, sha1_to_hex(o
->sha1
), 40);
550 if (write_in_full(cmd
.in
, namebuf
, 41) < 0)
555 sigchain_pop(SIGPIPE
);
558 * The commits out of the rev-list are not ancestors of
561 i
= read_in_full(cmd
.out
, namebuf
, 1);
567 * rev-list may have died by encountering a bad commit
568 * in the history, in which case we do want to bail out
569 * even when it showed no commit.
571 if (finish_command(&cmd
))
574 /* All the non-tip ones are ancestors of what we advertised */
578 /* Pick one of them (we know there at least is one) */
579 for (i
= 0; i
< want_obj
.nr
; i
++) {
580 o
= want_obj
.objects
[i
].item
;
581 if (!(o
->flags
& OUR_REF
))
582 die("git upload-pack: not our ref %s",
583 sha1_to_hex(o
->sha1
));
587 static void receive_needs(void)
589 struct object_array shallows
= OBJECT_ARRAY_INIT
;
590 static char line
[1000];
596 write_str_in_full(debug_fd
, "#S\n");
599 unsigned char sha1_buf
[20];
600 len
= packet_read_line(0, line
, sizeof(line
));
605 write_in_full(debug_fd
, line
, len
);
607 if (!prefixcmp(line
, "shallow ")) {
608 unsigned char sha1
[20];
609 struct object
*object
;
610 if (get_sha1(line
+ 8, sha1
))
611 die("invalid shallow line: %s", line
);
612 object
= parse_object(sha1
);
614 die("did not find object for %s", line
);
615 object
->flags
|= CLIENT_SHALLOW
;
616 add_object_array(object
, NULL
, &shallows
);
619 if (!prefixcmp(line
, "deepen ")) {
621 depth
= strtol(line
+ 7, &end
, 0);
622 if (end
== line
+ 7 || depth
<= 0)
623 die("Invalid deepen: %s", line
);
626 if (prefixcmp(line
, "want ") ||
627 get_sha1_hex(line
+5, sha1_buf
))
628 die("git upload-pack: protocol error, "
629 "expected to get sha, not '%s'", line
);
630 if (strstr(line
+45, "multi_ack_detailed"))
632 else if (strstr(line
+45, "multi_ack"))
634 if (strstr(line
+45, "no-done"))
636 if (strstr(line
+45, "thin-pack"))
638 if (strstr(line
+45, "ofs-delta"))
640 if (strstr(line
+45, "side-band-64k"))
641 use_sideband
= LARGE_PACKET_MAX
;
642 else if (strstr(line
+45, "side-band"))
643 use_sideband
= DEFAULT_PACKET_MAX
;
644 if (strstr(line
+45, "no-progress"))
646 if (strstr(line
+45, "include-tag"))
649 o
= lookup_object(sha1_buf
);
651 die("git upload-pack: not our ref %s",
652 sha1_to_hex(sha1_buf
));
653 if (!(o
->flags
& WANTED
)) {
655 if (!(o
->flags
& OUR_REF
))
657 add_object_array(o
, NULL
, &want_obj
);
661 write_str_in_full(debug_fd
, "#E\n");
664 * We have sent all our refs already, and the other end
665 * should have chosen out of them. When we are operating
666 * in the stateless RPC mode, however, their choice may
667 * have been based on the set of older refs advertised
668 * by another process that handled the initial request.
673 if (!use_sideband
&& daemon_mode
)
676 if (depth
== 0 && shallows
.nr
== 0)
679 struct commit_list
*result
, *backup
;
681 backup
= result
= get_shallow_commits(&want_obj
, depth
,
682 SHALLOW
, NOT_SHALLOW
);
684 struct object
*object
= &result
->item
->object
;
685 if (!(object
->flags
& (CLIENT_SHALLOW
|NOT_SHALLOW
))) {
686 packet_write(1, "shallow %s",
687 sha1_to_hex(object
->sha1
));
688 register_shallow(object
->sha1
);
691 result
= result
->next
;
693 free_commit_list(backup
);
694 for (i
= 0; i
< shallows
.nr
; i
++) {
695 struct object
*object
= shallows
.objects
[i
].item
;
696 if (object
->flags
& NOT_SHALLOW
) {
697 struct commit_list
*parents
;
698 packet_write(1, "unshallow %s",
699 sha1_to_hex(object
->sha1
));
700 object
->flags
&= ~CLIENT_SHALLOW
;
701 /* make sure the real parents are parsed */
702 unregister_shallow(object
->sha1
);
704 if (parse_commit((struct commit
*)object
))
705 die("invalid commit");
706 parents
= ((struct commit
*)object
)->parents
;
708 add_object_array(&parents
->item
->object
,
710 parents
= parents
->next
;
712 add_object_array(object
, NULL
, &extra_edge_obj
);
714 /* make sure commit traversal conforms to client */
715 register_shallow(object
->sha1
);
719 if (shallows
.nr
> 0) {
721 for (i
= 0; i
< shallows
.nr
; i
++)
722 register_shallow(shallows
.objects
[i
].item
->sha1
);
725 shallow_nr
+= shallows
.nr
;
726 free(shallows
.objects
);
729 static int send_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
731 static const char *capabilities
= "multi_ack thin-pack side-band"
732 " side-band-64k ofs-delta shallow no-progress"
733 " include-tag multi_ack_detailed";
734 struct object
*o
= parse_object(sha1
);
735 const char *refname_nons
= strip_namespace(refname
);
738 die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1
));
741 packet_write(1, "%s %s%c%s%s\n", sha1_to_hex(sha1
), refname_nons
,
743 stateless_rpc
? " no-done" : "");
745 packet_write(1, "%s %s\n", sha1_to_hex(sha1
), refname_nons
);
747 if (!(o
->flags
& OUR_REF
)) {
751 if (o
->type
== OBJ_TAG
) {
752 o
= deref_tag(o
, refname
, 0);
754 packet_write(1, "%s %s^{}\n", sha1_to_hex(o
->sha1
), refname_nons
);
759 static int mark_our_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
761 struct object
*o
= parse_object(sha1
);
763 die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1
));
764 if (!(o
->flags
& OUR_REF
)) {
771 static void upload_pack(void)
773 if (advertise_refs
|| !stateless_rpc
) {
775 head_ref_namespaced(send_ref
, NULL
);
776 for_each_namespaced_ref(send_ref
, NULL
);
779 head_ref_namespaced(mark_our_ref
, NULL
);
780 for_each_namespaced_ref(mark_our_ref
, NULL
);
787 get_common_commits();
792 int main(int argc
, char **argv
)
798 packet_trace_identity("upload-pack");
799 git_extract_argv0_path(argv
[0]);
800 read_replace_refs
= 0;
802 for (i
= 1; i
< argc
; i
++) {
807 if (!strcmp(arg
, "--advertise-refs")) {
811 if (!strcmp(arg
, "--stateless-rpc")) {
815 if (!strcmp(arg
, "--strict")) {
819 if (!prefixcmp(arg
, "--timeout=")) {
820 timeout
= atoi(arg
+10);
824 if (!strcmp(arg
, "--")) {
831 usage(upload_pack_usage
);
837 if (!enter_repo(dir
, strict
))
838 die("'%s' does not appear to be a git repository", dir
);
839 if (is_repository_shallow())
840 die("attempt to fetch/clone from a shallow repository");
841 if (getenv("GIT_DEBUG_SEND_PACK"))
842 debug_fd
= atoi(getenv("GIT_DEBUG_SEND_PACK"));