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)
29 #define HIDDEN_REF (1u << 19)
31 static unsigned long oldest_have
;
35 static int use_thin_pack
, use_ofs_delta
, use_include_tag
;
36 static int no_progress
, daemon_mode
;
37 static int allow_tip_sha1_in_want
;
38 static int shallow_nr
;
39 static struct object_array have_obj
;
40 static struct object_array want_obj
;
41 static struct object_array extra_edge_obj
;
42 static unsigned int timeout
;
44 * otherwise maximum packet size (up to 65520 bytes).
46 static int use_sideband
;
48 static int advertise_refs
;
49 static int stateless_rpc
;
51 static void reset_timeout(void)
56 static int strip(char *line
, int len
)
58 if (len
&& line
[len
-1] == '\n')
63 static ssize_t
send_client_data(int fd
, const char *data
, ssize_t sz
)
66 return send_sideband(1, fd
, data
, sz
, use_sideband
);
71 /* XXX: are we happy to lose stuff here? */
75 return safe_write(fd
, data
, sz
);
78 static FILE *pack_pipe
= NULL
;
79 static void show_commit(struct commit
*commit
, void *data
)
81 if (commit
->object
.flags
& BOUNDARY
)
82 fputc('-', pack_pipe
);
83 if (fputs(sha1_to_hex(commit
->object
.sha1
), pack_pipe
) < 0)
84 die("broken output pipe");
85 fputc('\n', pack_pipe
);
88 commit
->buffer
= NULL
;
91 static void show_object(struct object
*obj
,
92 const struct name_path
*path
, const char *component
,
95 show_object_with_name(pack_pipe
, obj
, path
, component
);
98 static void show_edge(struct commit
*commit
)
100 fprintf(pack_pipe
, "-%s\n", sha1_to_hex(commit
->object
.sha1
));
103 static int do_rev_list(int in
, int out
, void *user_data
)
106 struct rev_info revs
;
108 pack_pipe
= xfdopen(out
, "w");
109 init_revisions(&revs
, NULL
);
110 revs
.tag_objects
= 1;
111 revs
.tree_objects
= 1;
112 revs
.blob_objects
= 1;
116 for (i
= 0; i
< want_obj
.nr
; i
++) {
117 struct object
*o
= want_obj
.objects
[i
].item
;
119 o
->flags
&= ~UNINTERESTING
;
120 add_pending_object(&revs
, o
, NULL
);
122 for (i
= 0; i
< have_obj
.nr
; i
++) {
123 struct object
*o
= have_obj
.objects
[i
].item
;
124 o
->flags
|= UNINTERESTING
;
125 add_pending_object(&revs
, o
, NULL
);
127 setup_revisions(0, NULL
, &revs
, NULL
);
128 if (prepare_revision_walk(&revs
))
129 die("revision walk setup failed");
130 mark_edges_uninteresting(revs
.commits
, &revs
, show_edge
);
132 for (i
= 0; i
< extra_edge_obj
.nr
; i
++)
133 fprintf(pack_pipe
, "-%s\n", sha1_to_hex(
134 extra_edge_obj
.objects
[i
].item
->sha1
));
135 traverse_commit_list(&revs
, show_commit
, show_object
, NULL
);
141 static void create_pack_file(void)
143 struct async rev_list
;
144 struct child_process pack_objects
;
145 char data
[8193], progress
[128];
146 char abort_msg
[] = "aborting due to possible repository "
147 "corruption on the remote side.";
150 const char *argv
[10];
153 argv
[arg
++] = "pack-objects";
155 argv
[arg
++] = "--revs";
157 argv
[arg
++] = "--thin";
160 argv
[arg
++] = "--stdout";
162 argv
[arg
++] = "--progress";
164 argv
[arg
++] = "--delta-base-offset";
166 argv
[arg
++] = "--include-tag";
169 memset(&pack_objects
, 0, sizeof(pack_objects
));
170 pack_objects
.in
= -1;
171 pack_objects
.out
= -1;
172 pack_objects
.err
= -1;
173 pack_objects
.git_cmd
= 1;
174 pack_objects
.argv
= argv
;
176 if (start_command(&pack_objects
))
177 die("git upload-pack: unable to fork git-pack-objects");
180 memset(&rev_list
, 0, sizeof(rev_list
));
181 rev_list
.proc
= do_rev_list
;
182 rev_list
.out
= pack_objects
.in
;
183 if (start_async(&rev_list
))
184 die("git upload-pack: unable to fork git-rev-list");
187 FILE *pipe_fd
= xfdopen(pack_objects
.in
, "w");
190 for (i
= 0; i
< want_obj
.nr
; i
++)
191 fprintf(pipe_fd
, "%s\n",
192 sha1_to_hex(want_obj
.objects
[i
].item
->sha1
));
193 fprintf(pipe_fd
, "--not\n");
194 for (i
= 0; i
< have_obj
.nr
; i
++)
195 fprintf(pipe_fd
, "%s\n",
196 sha1_to_hex(have_obj
.objects
[i
].item
->sha1
));
197 fprintf(pipe_fd
, "\n");
203 /* We read from pack_objects.err to capture stderr output for
204 * progress bar, and pack_objects.out to capture the pack data.
208 struct pollfd pfd
[2];
209 int pe
, pu
, pollsize
;
216 if (0 <= pack_objects
.out
) {
217 pfd
[pollsize
].fd
= pack_objects
.out
;
218 pfd
[pollsize
].events
= POLLIN
;
222 if (0 <= pack_objects
.err
) {
223 pfd
[pollsize
].fd
= pack_objects
.err
;
224 pfd
[pollsize
].events
= POLLIN
;
232 if (poll(pfd
, pollsize
, -1) < 0) {
233 if (errno
!= EINTR
) {
234 error("poll failed, resuming: %s",
240 if (0 <= pe
&& (pfd
[pe
].revents
& (POLLIN
|POLLHUP
))) {
241 /* Status ready; we ship that in the side-band
242 * or dump to the standard error.
244 sz
= xread(pack_objects
.err
, progress
,
247 send_client_data(2, progress
, sz
);
249 close(pack_objects
.err
);
250 pack_objects
.err
= -1;
254 /* give priority to status messages */
257 if (0 <= pu
&& (pfd
[pu
].revents
& (POLLIN
|POLLHUP
))) {
258 /* Data ready; we keep the last byte to ourselves
259 * in case we detect broken rev-list, so that we
260 * can leave the stream corrupted. This is
261 * unfortunate -- unpack-objects would happily
262 * accept a valid packdata with trailing garbage,
263 * so appending garbage after we pass all the
264 * pack data is not good enough to signal
265 * breakage to downstream.
273 sz
= xread(pack_objects
.out
, cp
,
274 sizeof(data
) - outsz
);
278 close(pack_objects
.out
);
279 pack_objects
.out
= -1;
285 buffered
= data
[sz
-1] & 0xFF;
290 sz
= send_client_data(1, data
, sz
);
296 if (finish_command(&pack_objects
)) {
297 error("git upload-pack: git-pack-objects died with error.");
300 if (shallow_nr
&& finish_async(&rev_list
))
301 goto fail
; /* error was already reported */
306 sz
= send_client_data(1, data
, 1);
309 fprintf(stderr
, "flushed.\n");
316 send_client_data(3, abort_msg
, sizeof(abort_msg
));
317 die("git upload-pack: %s", abort_msg
);
320 static int got_sha1(char *hex
, unsigned char *sha1
)
323 int we_knew_they_have
= 0;
325 if (get_sha1_hex(hex
, sha1
))
326 die("git upload-pack: expected SHA1 object, got '%s'", hex
);
327 if (!has_sha1_file(sha1
))
330 o
= lookup_object(sha1
);
331 if (!(o
&& o
->parsed
))
332 o
= parse_object(sha1
);
334 die("oops (%s)", sha1_to_hex(sha1
));
335 if (o
->type
== OBJ_COMMIT
) {
336 struct commit_list
*parents
;
337 struct commit
*commit
= (struct commit
*)o
;
338 if (o
->flags
& THEY_HAVE
)
339 we_knew_they_have
= 1;
341 o
->flags
|= THEY_HAVE
;
342 if (!oldest_have
|| (commit
->date
< oldest_have
))
343 oldest_have
= commit
->date
;
344 for (parents
= commit
->parents
;
346 parents
= parents
->next
)
347 parents
->item
->object
.flags
|= THEY_HAVE
;
349 if (!we_knew_they_have
) {
350 add_object_array(o
, NULL
, &have_obj
);
356 static int reachable(struct commit
*want
)
358 struct commit_list
*work
= NULL
;
360 commit_list_insert_by_date(want
, &work
);
362 struct commit_list
*list
= work
->next
;
363 struct commit
*commit
= work
->item
;
367 if (commit
->object
.flags
& THEY_HAVE
) {
368 want
->object
.flags
|= COMMON_KNOWN
;
371 if (!commit
->object
.parsed
)
372 parse_object(commit
->object
.sha1
);
373 if (commit
->object
.flags
& REACHABLE
)
375 commit
->object
.flags
|= REACHABLE
;
376 if (commit
->date
< oldest_have
)
378 for (list
= commit
->parents
; list
; list
= list
->next
) {
379 struct commit
*parent
= list
->item
;
380 if (!(parent
->object
.flags
& REACHABLE
))
381 commit_list_insert_by_date(parent
, &work
);
384 want
->object
.flags
|= REACHABLE
;
385 clear_commit_marks(want
, REACHABLE
);
386 free_commit_list(work
);
387 return (want
->object
.flags
& COMMON_KNOWN
);
390 static int ok_to_give_up(void)
397 for (i
= 0; i
< want_obj
.nr
; i
++) {
398 struct object
*want
= want_obj
.objects
[i
].item
;
400 if (want
->flags
& COMMON_KNOWN
)
402 want
= deref_tag(want
, "a want line", 0);
403 if (!want
|| want
->type
!= OBJ_COMMIT
) {
404 /* no way to tell if this is reachable by
405 * looking at the ancestry chain alone, so
406 * leave a note to ourselves not to worry about
407 * this object anymore.
409 want_obj
.objects
[i
].item
->flags
|= COMMON_KNOWN
;
412 if (!reachable((struct commit
*)want
))
418 static int get_common_commits(void)
420 static char line
[1000];
421 unsigned char sha1
[20];
427 save_commit_buffer
= 0;
430 int len
= packet_read_line(0, line
, sizeof(line
));
434 if (multi_ack
== 2 && got_common
435 && !got_other
&& ok_to_give_up()) {
437 packet_write(1, "ACK %s ready\n", last_hex
);
439 if (have_obj
.nr
== 0 || multi_ack
)
440 packet_write(1, "NAK\n");
442 if (no_done
&& sent_ready
) {
443 packet_write(1, "ACK %s\n", last_hex
);
453 if (!prefixcmp(line
, "have ")) {
454 switch (got_sha1(line
+5, sha1
)) {
455 case -1: /* they have what we do not */
457 if (multi_ack
&& ok_to_give_up()) {
458 const char *hex
= sha1_to_hex(sha1
);
459 if (multi_ack
== 2) {
461 packet_write(1, "ACK %s ready\n", hex
);
463 packet_write(1, "ACK %s continue\n", hex
);
468 memcpy(last_hex
, sha1_to_hex(sha1
), 41);
470 packet_write(1, "ACK %s common\n", last_hex
);
472 packet_write(1, "ACK %s continue\n", last_hex
);
473 else if (have_obj
.nr
== 1)
474 packet_write(1, "ACK %s\n", last_hex
);
479 if (!strcmp(line
, "done")) {
480 if (have_obj
.nr
> 0) {
482 packet_write(1, "ACK %s\n", last_hex
);
485 packet_write(1, "NAK\n");
488 die("git upload-pack: expected SHA1 list, got '%s'", line
);
492 static int is_our_ref(struct object
*o
)
495 ((allow_tip_sha1_in_want
? HIDDEN_REF
: 0) | OUR_REF
);
498 static void check_non_tip(void)
500 static const char *argv
[] = {
501 "rev-list", "--stdin", NULL
,
503 static struct child_process cmd
;
505 char namebuf
[42]; /* ^ + SHA-1 + LF */
508 /* In the normal in-process case non-tip request can never happen */
518 if (start_command(&cmd
))
522 * If rev-list --stdin encounters an unknown commit, it
523 * terminates, which will cause SIGPIPE in the write loop
526 sigchain_push(SIGPIPE
, SIG_IGN
);
530 for (i
= get_max_object_index(); 0 < i
; ) {
531 o
= get_indexed_object(--i
);
536 memcpy(namebuf
+ 1, sha1_to_hex(o
->sha1
), 40);
537 if (write_in_full(cmd
.in
, namebuf
, 42) < 0)
541 for (i
= 0; i
< want_obj
.nr
; i
++) {
542 o
= want_obj
.objects
[i
].item
;
545 memcpy(namebuf
, sha1_to_hex(o
->sha1
), 40);
546 if (write_in_full(cmd
.in
, namebuf
, 41) < 0)
551 sigchain_pop(SIGPIPE
);
554 * The commits out of the rev-list are not ancestors of
557 i
= read_in_full(cmd
.out
, namebuf
, 1);
563 * rev-list may have died by encountering a bad commit
564 * in the history, in which case we do want to bail out
565 * even when it showed no commit.
567 if (finish_command(&cmd
))
570 /* All the non-tip ones are ancestors of what we advertised */
574 /* Pick one of them (we know there at least is one) */
575 for (i
= 0; i
< want_obj
.nr
; i
++) {
576 o
= want_obj
.objects
[i
].item
;
578 die("git upload-pack: not our ref %s",
579 sha1_to_hex(o
->sha1
));
583 static void receive_needs(void)
585 struct object_array shallows
= OBJECT_ARRAY_INIT
;
586 static char line
[1000];
592 write_str_in_full(debug_fd
, "#S\n");
595 const char *features
;
596 unsigned char sha1_buf
[20];
597 len
= packet_read_line(0, line
, sizeof(line
));
602 write_in_full(debug_fd
, line
, len
);
604 if (!prefixcmp(line
, "shallow ")) {
605 unsigned char sha1
[20];
606 struct object
*object
;
607 if (get_sha1(line
+ 8, sha1
))
608 die("invalid shallow line: %s", line
);
609 object
= parse_object(sha1
);
611 die("did not find object for %s", line
);
612 if (object
->type
!= OBJ_COMMIT
)
613 die("invalid shallow object %s", sha1_to_hex(sha1
));
614 object
->flags
|= CLIENT_SHALLOW
;
615 add_object_array(object
, NULL
, &shallows
);
618 if (!prefixcmp(line
, "deepen ")) {
620 depth
= strtol(line
+ 7, &end
, 0);
621 if (end
== line
+ 7 || depth
<= 0)
622 die("Invalid deepen: %s", line
);
625 if (prefixcmp(line
, "want ") ||
626 get_sha1_hex(line
+5, sha1_buf
))
627 die("git upload-pack: protocol error, "
628 "expected to get sha, not '%s'", line
);
630 features
= line
+ 45;
632 if (parse_feature_request(features
, "multi_ack_detailed"))
634 else if (parse_feature_request(features
, "multi_ack"))
636 if (parse_feature_request(features
, "no-done"))
638 if (parse_feature_request(features
, "thin-pack"))
640 if (parse_feature_request(features
, "ofs-delta"))
642 if (parse_feature_request(features
, "side-band-64k"))
643 use_sideband
= LARGE_PACKET_MAX
;
644 else if (parse_feature_request(features
, "side-band"))
645 use_sideband
= DEFAULT_PACKET_MAX
;
646 if (parse_feature_request(features
, "no-progress"))
648 if (parse_feature_request(features
, "include-tag"))
651 o
= lookup_object(sha1_buf
);
653 die("git upload-pack: not our ref %s",
654 sha1_to_hex(sha1_buf
));
655 if (!(o
->flags
& WANTED
)) {
659 add_object_array(o
, NULL
, &want_obj
);
663 write_str_in_full(debug_fd
, "#E\n");
666 * We have sent all our refs already, and the other end
667 * should have chosen out of them. When we are operating
668 * in the stateless RPC mode, however, their choice may
669 * have been based on the set of older refs advertised
670 * by another process that handled the initial request.
675 if (!use_sideband
&& daemon_mode
)
678 if (depth
== 0 && shallows
.nr
== 0)
681 struct commit_list
*result
, *backup
;
683 backup
= result
= get_shallow_commits(&want_obj
, depth
,
684 SHALLOW
, NOT_SHALLOW
);
686 struct object
*object
= &result
->item
->object
;
687 if (!(object
->flags
& (CLIENT_SHALLOW
|NOT_SHALLOW
))) {
688 packet_write(1, "shallow %s",
689 sha1_to_hex(object
->sha1
));
690 register_shallow(object
->sha1
);
693 result
= result
->next
;
695 free_commit_list(backup
);
696 for (i
= 0; i
< shallows
.nr
; i
++) {
697 struct object
*object
= shallows
.objects
[i
].item
;
698 if (object
->flags
& NOT_SHALLOW
) {
699 struct commit_list
*parents
;
700 packet_write(1, "unshallow %s",
701 sha1_to_hex(object
->sha1
));
702 object
->flags
&= ~CLIENT_SHALLOW
;
703 /* make sure the real parents are parsed */
704 unregister_shallow(object
->sha1
);
706 if (parse_commit((struct commit
*)object
))
707 die("invalid commit");
708 parents
= ((struct commit
*)object
)->parents
;
710 add_object_array(&parents
->item
->object
,
712 parents
= parents
->next
;
714 add_object_array(object
, NULL
, &extra_edge_obj
);
716 /* make sure commit traversal conforms to client */
717 register_shallow(object
->sha1
);
721 if (shallows
.nr
> 0) {
723 for (i
= 0; i
< shallows
.nr
; i
++)
724 register_shallow(shallows
.objects
[i
].item
->sha1
);
727 shallow_nr
+= shallows
.nr
;
728 free(shallows
.objects
);
731 /* return non-zero if the ref is hidden, otherwise 0 */
732 static int mark_our_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
734 struct object
*o
= lookup_unknown_object(sha1
);
736 if (ref_is_hidden(refname
)) {
737 o
->flags
|= HIDDEN_REF
;
741 die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1
));
746 static int send_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
748 static const char *capabilities
= "multi_ack thin-pack side-band"
749 " side-band-64k ofs-delta shallow no-progress"
750 " include-tag multi_ack_detailed";
751 const char *refname_nons
= strip_namespace(refname
);
752 unsigned char peeled
[20];
754 if (mark_our_ref(refname
, sha1
, flag
, cb_data
))
758 packet_write(1, "%s %s%c%s%s%s agent=%s\n",
759 sha1_to_hex(sha1
), refname_nons
,
761 allow_tip_sha1_in_want
? " allow-tip-sha1-in-want" : "",
762 stateless_rpc
? " no-done" : "",
763 git_user_agent_sanitized());
765 packet_write(1, "%s %s\n", sha1_to_hex(sha1
), refname_nons
);
767 if (!peel_ref(refname
, peeled
))
768 packet_write(1, "%s %s^{}\n", sha1_to_hex(peeled
), refname_nons
);
772 static void upload_pack(void)
774 if (advertise_refs
|| !stateless_rpc
) {
776 head_ref_namespaced(send_ref
, NULL
);
777 for_each_namespaced_ref(send_ref
, NULL
);
780 head_ref_namespaced(mark_our_ref
, NULL
);
781 for_each_namespaced_ref(mark_our_ref
, NULL
);
788 get_common_commits();
793 static int upload_pack_config(const char *var
, const char *value
, void *unused
)
795 if (!strcmp("uploadpack.allowtipsha1inwant", var
))
796 allow_tip_sha1_in_want
= git_config_bool(var
, value
);
797 return parse_hide_refs_config(var
, value
, "uploadpack");
800 int main(int argc
, char **argv
)
808 packet_trace_identity("upload-pack");
809 git_extract_argv0_path(argv
[0]);
810 read_replace_refs
= 0;
812 for (i
= 1; i
< argc
; i
++) {
817 if (!strcmp(arg
, "--advertise-refs")) {
821 if (!strcmp(arg
, "--stateless-rpc")) {
825 if (!strcmp(arg
, "--strict")) {
829 if (!prefixcmp(arg
, "--timeout=")) {
830 timeout
= atoi(arg
+10);
834 if (!strcmp(arg
, "--")) {
841 usage(upload_pack_usage
);
847 if (!enter_repo(dir
, strict
))
848 die("'%s' does not appear to be a git repository", dir
);
849 if (is_repository_shallow())
850 die("attempt to fetch/clone from a shallow repository");
851 git_config(upload_pack_config
, NULL
);
852 if (getenv("GIT_DEBUG_SEND_PACK"))
853 debug_fd
= atoi(getenv("GIT_DEBUG_SEND_PACK"));