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 show_object_with_name(pack_pipe
, obj
, path
, component
);
92 static void show_edge(struct commit
*commit
)
94 fprintf(pack_pipe
, "-%s\n", sha1_to_hex(commit
->object
.sha1
));
97 static int do_rev_list(int in
, int out
, void *user_data
)
100 struct rev_info revs
;
102 pack_pipe
= xfdopen(out
, "w");
103 init_revisions(&revs
, NULL
);
104 revs
.tag_objects
= 1;
105 revs
.tree_objects
= 1;
106 revs
.blob_objects
= 1;
110 for (i
= 0; i
< want_obj
.nr
; i
++) {
111 struct object
*o
= want_obj
.objects
[i
].item
;
113 o
->flags
&= ~UNINTERESTING
;
114 add_pending_object(&revs
, o
, NULL
);
116 for (i
= 0; i
< have_obj
.nr
; i
++) {
117 struct object
*o
= have_obj
.objects
[i
].item
;
118 o
->flags
|= UNINTERESTING
;
119 add_pending_object(&revs
, o
, NULL
);
121 setup_revisions(0, NULL
, &revs
, NULL
);
122 if (prepare_revision_walk(&revs
))
123 die("revision walk setup failed");
124 mark_edges_uninteresting(revs
.commits
, &revs
, show_edge
);
126 for (i
= 0; i
< extra_edge_obj
.nr
; i
++)
127 fprintf(pack_pipe
, "-%s\n", sha1_to_hex(
128 extra_edge_obj
.objects
[i
].item
->sha1
));
129 traverse_commit_list(&revs
, show_commit
, show_object
, NULL
);
135 static void create_pack_file(void)
137 struct async rev_list
;
138 struct child_process pack_objects
;
139 int create_full_pack
= (nr_our_refs
== want_obj
.nr
&& !have_obj
.nr
);
140 char data
[8193], progress
[128];
141 char abort_msg
[] = "aborting due to possible repository "
142 "corruption on the remote side.";
145 const char *argv
[10];
148 argv
[arg
++] = "pack-objects";
150 argv
[arg
++] = "--revs";
151 if (create_full_pack
)
152 argv
[arg
++] = "--all";
153 else if (use_thin_pack
)
154 argv
[arg
++] = "--thin";
157 argv
[arg
++] = "--stdout";
159 argv
[arg
++] = "--progress";
161 argv
[arg
++] = "--delta-base-offset";
163 argv
[arg
++] = "--include-tag";
166 memset(&pack_objects
, 0, sizeof(pack_objects
));
167 pack_objects
.in
= -1;
168 pack_objects
.out
= -1;
169 pack_objects
.err
= -1;
170 pack_objects
.git_cmd
= 1;
171 pack_objects
.argv
= argv
;
173 if (start_command(&pack_objects
))
174 die("git upload-pack: unable to fork git-pack-objects");
177 memset(&rev_list
, 0, sizeof(rev_list
));
178 rev_list
.proc
= do_rev_list
;
179 rev_list
.out
= pack_objects
.in
;
180 if (start_async(&rev_list
))
181 die("git upload-pack: unable to fork git-rev-list");
184 FILE *pipe_fd
= xfdopen(pack_objects
.in
, "w");
185 if (!create_full_pack
) {
187 for (i
= 0; i
< want_obj
.nr
; i
++)
188 fprintf(pipe_fd
, "%s\n", sha1_to_hex(want_obj
.objects
[i
].item
->sha1
));
189 fprintf(pipe_fd
, "--not\n");
190 for (i
= 0; i
< have_obj
.nr
; i
++)
191 fprintf(pipe_fd
, "%s\n", sha1_to_hex(have_obj
.objects
[i
].item
->sha1
));
194 fprintf(pipe_fd
, "\n");
200 /* We read from pack_objects.err to capture stderr output for
201 * progress bar, and pack_objects.out to capture the pack data.
205 struct pollfd pfd
[2];
206 int pe
, pu
, pollsize
;
213 if (0 <= pack_objects
.out
) {
214 pfd
[pollsize
].fd
= pack_objects
.out
;
215 pfd
[pollsize
].events
= POLLIN
;
219 if (0 <= pack_objects
.err
) {
220 pfd
[pollsize
].fd
= pack_objects
.err
;
221 pfd
[pollsize
].events
= POLLIN
;
229 if (poll(pfd
, pollsize
, -1) < 0) {
230 if (errno
!= EINTR
) {
231 error("poll failed, resuming: %s",
237 if (0 <= pe
&& (pfd
[pe
].revents
& (POLLIN
|POLLHUP
))) {
238 /* Status ready; we ship that in the side-band
239 * or dump to the standard error.
241 sz
= xread(pack_objects
.err
, progress
,
244 send_client_data(2, progress
, sz
);
246 close(pack_objects
.err
);
247 pack_objects
.err
= -1;
251 /* give priority to status messages */
254 if (0 <= pu
&& (pfd
[pu
].revents
& (POLLIN
|POLLHUP
))) {
255 /* Data ready; we keep the last byte to ourselves
256 * in case we detect broken rev-list, so that we
257 * can leave the stream corrupted. This is
258 * unfortunate -- unpack-objects would happily
259 * accept a valid packdata with trailing garbage,
260 * so appending garbage after we pass all the
261 * pack data is not good enough to signal
262 * breakage to downstream.
270 sz
= xread(pack_objects
.out
, cp
,
271 sizeof(data
) - outsz
);
275 close(pack_objects
.out
);
276 pack_objects
.out
= -1;
282 buffered
= data
[sz
-1] & 0xFF;
287 sz
= send_client_data(1, data
, sz
);
293 if (finish_command(&pack_objects
)) {
294 error("git upload-pack: git-pack-objects died with error.");
297 if (shallow_nr
&& finish_async(&rev_list
))
298 goto fail
; /* error was already reported */
303 sz
= send_client_data(1, data
, 1);
306 fprintf(stderr
, "flushed.\n");
313 send_client_data(3, abort_msg
, sizeof(abort_msg
));
314 die("git upload-pack: %s", abort_msg
);
317 static int got_sha1(char *hex
, unsigned char *sha1
)
320 int we_knew_they_have
= 0;
322 if (get_sha1_hex(hex
, sha1
))
323 die("git upload-pack: expected SHA1 object, got '%s'", hex
);
324 if (!has_sha1_file(sha1
))
327 o
= lookup_object(sha1
);
328 if (!(o
&& o
->parsed
))
329 o
= parse_object(sha1
);
331 die("oops (%s)", sha1_to_hex(sha1
));
332 if (o
->type
== OBJ_COMMIT
) {
333 struct commit_list
*parents
;
334 struct commit
*commit
= (struct commit
*)o
;
335 if (o
->flags
& THEY_HAVE
)
336 we_knew_they_have
= 1;
338 o
->flags
|= THEY_HAVE
;
339 if (!oldest_have
|| (commit
->date
< oldest_have
))
340 oldest_have
= commit
->date
;
341 for (parents
= commit
->parents
;
343 parents
= parents
->next
)
344 parents
->item
->object
.flags
|= THEY_HAVE
;
346 if (!we_knew_they_have
) {
347 add_object_array(o
, NULL
, &have_obj
);
353 static int reachable(struct commit
*want
)
355 struct commit_list
*work
= NULL
;
357 commit_list_insert_by_date(want
, &work
);
359 struct commit_list
*list
= work
->next
;
360 struct commit
*commit
= work
->item
;
364 if (commit
->object
.flags
& THEY_HAVE
) {
365 want
->object
.flags
|= COMMON_KNOWN
;
368 if (!commit
->object
.parsed
)
369 parse_object(commit
->object
.sha1
);
370 if (commit
->object
.flags
& REACHABLE
)
372 commit
->object
.flags
|= REACHABLE
;
373 if (commit
->date
< oldest_have
)
375 for (list
= commit
->parents
; list
; list
= list
->next
) {
376 struct commit
*parent
= list
->item
;
377 if (!(parent
->object
.flags
& REACHABLE
))
378 commit_list_insert_by_date(parent
, &work
);
381 want
->object
.flags
|= REACHABLE
;
382 clear_commit_marks(want
, REACHABLE
);
383 free_commit_list(work
);
384 return (want
->object
.flags
& COMMON_KNOWN
);
387 static int ok_to_give_up(void)
394 for (i
= 0; i
< want_obj
.nr
; i
++) {
395 struct object
*want
= want_obj
.objects
[i
].item
;
397 if (want
->flags
& COMMON_KNOWN
)
399 want
= deref_tag(want
, "a want line", 0);
400 if (!want
|| want
->type
!= OBJ_COMMIT
) {
401 /* no way to tell if this is reachable by
402 * looking at the ancestry chain alone, so
403 * leave a note to ourselves not to worry about
404 * this object anymore.
406 want_obj
.objects
[i
].item
->flags
|= COMMON_KNOWN
;
409 if (!reachable((struct commit
*)want
))
415 static int get_common_commits(void)
417 static char line
[1000];
418 unsigned char sha1
[20];
424 save_commit_buffer
= 0;
427 int len
= packet_read_line(0, line
, sizeof(line
));
431 if (multi_ack
== 2 && got_common
432 && !got_other
&& ok_to_give_up()) {
434 packet_write(1, "ACK %s ready\n", last_hex
);
436 if (have_obj
.nr
== 0 || multi_ack
)
437 packet_write(1, "NAK\n");
439 if (no_done
&& sent_ready
) {
440 packet_write(1, "ACK %s\n", last_hex
);
450 if (!prefixcmp(line
, "have ")) {
451 switch (got_sha1(line
+5, sha1
)) {
452 case -1: /* they have what we do not */
454 if (multi_ack
&& ok_to_give_up()) {
455 const char *hex
= sha1_to_hex(sha1
);
456 if (multi_ack
== 2) {
458 packet_write(1, "ACK %s ready\n", hex
);
460 packet_write(1, "ACK %s continue\n", hex
);
465 memcpy(last_hex
, sha1_to_hex(sha1
), 41);
467 packet_write(1, "ACK %s common\n", last_hex
);
469 packet_write(1, "ACK %s continue\n", last_hex
);
470 else if (have_obj
.nr
== 1)
471 packet_write(1, "ACK %s\n", last_hex
);
476 if (!strcmp(line
, "done")) {
477 if (have_obj
.nr
> 0) {
479 packet_write(1, "ACK %s\n", last_hex
);
482 packet_write(1, "NAK\n");
485 die("git upload-pack: expected SHA1 list, got '%s'", line
);
489 static void check_non_tip(void)
491 static const char *argv
[] = {
492 "rev-list", "--stdin", NULL
,
494 static struct child_process cmd
;
496 char namebuf
[42]; /* ^ + SHA-1 + LF */
499 /* In the normal in-process case non-tip request can never happen */
509 if (start_command(&cmd
))
513 * If rev-list --stdin encounters an unknown commit, it
514 * terminates, which will cause SIGPIPE in the write loop
517 sigchain_push(SIGPIPE
, SIG_IGN
);
521 for (i
= get_max_object_index(); 0 < i
; ) {
522 o
= get_indexed_object(--i
);
525 if (!(o
->flags
& OUR_REF
))
527 memcpy(namebuf
+ 1, sha1_to_hex(o
->sha1
), 40);
528 if (write_in_full(cmd
.in
, namebuf
, 42) < 0)
532 for (i
= 0; i
< want_obj
.nr
; i
++) {
533 o
= want_obj
.objects
[i
].item
;
534 if (o
->flags
& OUR_REF
)
536 memcpy(namebuf
, sha1_to_hex(o
->sha1
), 40);
537 if (write_in_full(cmd
.in
, namebuf
, 41) < 0)
542 sigchain_pop(SIGPIPE
);
545 * The commits out of the rev-list are not ancestors of
548 i
= read_in_full(cmd
.out
, namebuf
, 1);
554 * rev-list may have died by encountering a bad commit
555 * in the history, in which case we do want to bail out
556 * even when it showed no commit.
558 if (finish_command(&cmd
))
561 /* All the non-tip ones are ancestors of what we advertised */
565 /* Pick one of them (we know there at least is one) */
566 for (i
= 0; i
< want_obj
.nr
; i
++) {
567 o
= want_obj
.objects
[i
].item
;
568 if (!(o
->flags
& OUR_REF
))
569 die("git upload-pack: not our ref %s",
570 sha1_to_hex(o
->sha1
));
574 static void receive_needs(void)
576 struct object_array shallows
= OBJECT_ARRAY_INIT
;
577 static char line
[1000];
583 write_str_in_full(debug_fd
, "#S\n");
586 unsigned char sha1_buf
[20];
587 len
= packet_read_line(0, line
, sizeof(line
));
592 write_in_full(debug_fd
, line
, len
);
594 if (!prefixcmp(line
, "shallow ")) {
595 unsigned char sha1
[20];
596 struct object
*object
;
597 if (get_sha1(line
+ 8, sha1
))
598 die("invalid shallow line: %s", line
);
599 object
= parse_object(sha1
);
601 die("did not find object for %s", line
);
602 object
->flags
|= CLIENT_SHALLOW
;
603 add_object_array(object
, NULL
, &shallows
);
606 if (!prefixcmp(line
, "deepen ")) {
608 depth
= strtol(line
+ 7, &end
, 0);
609 if (end
== line
+ 7 || depth
<= 0)
610 die("Invalid deepen: %s", line
);
613 if (prefixcmp(line
, "want ") ||
614 get_sha1_hex(line
+5, sha1_buf
))
615 die("git upload-pack: protocol error, "
616 "expected to get sha, not '%s'", line
);
617 if (strstr(line
+45, "multi_ack_detailed"))
619 else if (strstr(line
+45, "multi_ack"))
621 if (strstr(line
+45, "no-done"))
623 if (strstr(line
+45, "thin-pack"))
625 if (strstr(line
+45, "ofs-delta"))
627 if (strstr(line
+45, "side-band-64k"))
628 use_sideband
= LARGE_PACKET_MAX
;
629 else if (strstr(line
+45, "side-band"))
630 use_sideband
= DEFAULT_PACKET_MAX
;
631 if (strstr(line
+45, "no-progress"))
633 if (strstr(line
+45, "include-tag"))
636 o
= lookup_object(sha1_buf
);
638 die("git upload-pack: not our ref %s",
639 sha1_to_hex(sha1_buf
));
640 if (!(o
->flags
& WANTED
)) {
642 if (!(o
->flags
& OUR_REF
))
644 add_object_array(o
, NULL
, &want_obj
);
648 write_str_in_full(debug_fd
, "#E\n");
651 * We have sent all our refs already, and the other end
652 * should have chosen out of them. When we are operating
653 * in the stateless RPC mode, however, their choice may
654 * have been based on the set of older refs advertised
655 * by another process that handled the initial request.
660 if (!use_sideband
&& daemon_mode
)
663 if (depth
== 0 && shallows
.nr
== 0)
666 struct commit_list
*result
, *backup
;
668 backup
= result
= get_shallow_commits(&want_obj
, depth
,
669 SHALLOW
, NOT_SHALLOW
);
671 struct object
*object
= &result
->item
->object
;
672 if (!(object
->flags
& (CLIENT_SHALLOW
|NOT_SHALLOW
))) {
673 packet_write(1, "shallow %s",
674 sha1_to_hex(object
->sha1
));
675 register_shallow(object
->sha1
);
678 result
= result
->next
;
680 free_commit_list(backup
);
681 for (i
= 0; i
< shallows
.nr
; i
++) {
682 struct object
*object
= shallows
.objects
[i
].item
;
683 if (object
->flags
& NOT_SHALLOW
) {
684 struct commit_list
*parents
;
685 packet_write(1, "unshallow %s",
686 sha1_to_hex(object
->sha1
));
687 object
->flags
&= ~CLIENT_SHALLOW
;
688 /* make sure the real parents are parsed */
689 unregister_shallow(object
->sha1
);
691 if (parse_commit((struct commit
*)object
))
692 die("invalid commit");
693 parents
= ((struct commit
*)object
)->parents
;
695 add_object_array(&parents
->item
->object
,
697 parents
= parents
->next
;
699 add_object_array(object
, NULL
, &extra_edge_obj
);
701 /* make sure commit traversal conforms to client */
702 register_shallow(object
->sha1
);
706 if (shallows
.nr
> 0) {
708 for (i
= 0; i
< shallows
.nr
; i
++)
709 register_shallow(shallows
.objects
[i
].item
->sha1
);
712 shallow_nr
+= shallows
.nr
;
713 free(shallows
.objects
);
716 static int send_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
718 static const char *capabilities
= "multi_ack thin-pack side-band"
719 " side-band-64k ofs-delta shallow no-progress"
720 " include-tag multi_ack_detailed";
721 struct object
*o
= parse_object(sha1
);
722 const char *refname_nons
= strip_namespace(refname
);
725 die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1
));
728 packet_write(1, "%s %s%c%s%s\n", sha1_to_hex(sha1
), refname_nons
,
730 stateless_rpc
? " no-done" : "");
732 packet_write(1, "%s %s\n", sha1_to_hex(sha1
), refname_nons
);
734 if (!(o
->flags
& OUR_REF
)) {
738 if (o
->type
== OBJ_TAG
) {
739 o
= deref_tag(o
, refname
, 0);
741 packet_write(1, "%s %s^{}\n", sha1_to_hex(o
->sha1
), refname_nons
);
746 static int mark_our_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
748 struct object
*o
= parse_object(sha1
);
750 die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1
));
751 if (!(o
->flags
& OUR_REF
)) {
758 static void upload_pack(void)
760 if (advertise_refs
|| !stateless_rpc
) {
762 head_ref_namespaced(send_ref
, NULL
);
763 for_each_namespaced_ref(send_ref
, NULL
);
766 head_ref_namespaced(mark_our_ref
, NULL
);
767 for_each_namespaced_ref(mark_our_ref
, NULL
);
774 get_common_commits();
779 int main(int argc
, char **argv
)
785 packet_trace_identity("upload-pack");
786 git_extract_argv0_path(argv
[0]);
787 read_replace_refs
= 0;
789 for (i
= 1; i
< argc
; i
++) {
794 if (!strcmp(arg
, "--advertise-refs")) {
798 if (!strcmp(arg
, "--stateless-rpc")) {
802 if (!strcmp(arg
, "--strict")) {
806 if (!prefixcmp(arg
, "--timeout=")) {
807 timeout
= atoi(arg
+10);
811 if (!strcmp(arg
, "--")) {
818 usage(upload_pack_usage
);
824 if (!enter_repo(dir
, strict
))
825 die("'%s' does not appear to be a git repository", dir
);
826 if (is_repository_shallow())
827 die("attempt to fetch/clone from a shallow repository");
828 if (getenv("GIT_DEBUG_SEND_PACK"))
829 debug_fd
= atoi(getenv("GIT_DEBUG_SEND_PACK"));