11 #include "list-objects.h"
12 #include "run-command.h"
16 #include "string-list.h"
18 static const char upload_pack_usage
[] = "git upload-pack [--strict] [--timeout=<n>] <dir>";
20 /* bits #0..7 in revision.h, #8..10 in commit.c */
21 #define THEY_HAVE (1u << 11)
22 #define OUR_REF (1u << 12)
23 #define WANTED (1u << 13)
24 #define COMMON_KNOWN (1u << 14)
25 #define REACHABLE (1u << 15)
27 #define SHALLOW (1u << 16)
28 #define NOT_SHALLOW (1u << 17)
29 #define CLIENT_SHALLOW (1u << 18)
30 #define HIDDEN_REF (1u << 19)
32 static unsigned long oldest_have
;
36 static int use_thin_pack
, use_ofs_delta
, use_include_tag
;
37 static int no_progress
, daemon_mode
;
38 static int allow_tip_sha1_in_want
;
39 static int shallow_nr
;
40 static struct object_array have_obj
;
41 static struct object_array want_obj
;
42 static struct object_array extra_edge_obj
;
43 static unsigned int timeout
;
44 static int keepalive
= 5;
46 * otherwise maximum packet size (up to 65520 bytes).
48 static int use_sideband
;
49 static int advertise_refs
;
50 static int stateless_rpc
;
52 static void reset_timeout(void)
57 static ssize_t
send_client_data(int fd
, const char *data
, ssize_t sz
)
60 return send_sideband(1, fd
, data
, sz
, use_sideband
);
65 /* XXX: are we happy to lose stuff here? */
69 write_or_die(fd
, data
, sz
);
73 static int write_one_shallow(const struct commit_graft
*graft
, void *cb_data
)
76 if (graft
->nr_parent
== -1)
77 fprintf(fp
, "--shallow %s\n", sha1_to_hex(graft
->sha1
));
81 static void create_pack_file(void)
83 struct child_process pack_objects
;
84 char data
[8193], progress
[128];
85 char abort_msg
[] = "aborting due to possible repository "
86 "corruption on the remote side.";
94 argv
[arg
++] = "--shallow-file";
97 argv
[arg
++] = "pack-objects";
98 argv
[arg
++] = "--revs";
100 argv
[arg
++] = "--thin";
102 argv
[arg
++] = "--stdout";
104 argv
[arg
++] = "--progress";
106 argv
[arg
++] = "--delta-base-offset";
108 argv
[arg
++] = "--include-tag";
111 memset(&pack_objects
, 0, sizeof(pack_objects
));
112 pack_objects
.in
= -1;
113 pack_objects
.out
= -1;
114 pack_objects
.err
= -1;
115 pack_objects
.git_cmd
= 1;
116 pack_objects
.argv
= argv
;
118 if (start_command(&pack_objects
))
119 die("git upload-pack: unable to fork git-pack-objects");
121 pipe_fd
= xfdopen(pack_objects
.in
, "w");
124 for_each_commit_graft(write_one_shallow
, pipe_fd
);
126 for (i
= 0; i
< want_obj
.nr
; i
++)
127 fprintf(pipe_fd
, "%s\n",
128 sha1_to_hex(want_obj
.objects
[i
].item
->sha1
));
129 fprintf(pipe_fd
, "--not\n");
130 for (i
= 0; i
< have_obj
.nr
; i
++)
131 fprintf(pipe_fd
, "%s\n",
132 sha1_to_hex(have_obj
.objects
[i
].item
->sha1
));
133 for (i
= 0; i
< extra_edge_obj
.nr
; i
++)
134 fprintf(pipe_fd
, "%s\n",
135 sha1_to_hex(extra_edge_obj
.objects
[i
].item
->sha1
));
136 fprintf(pipe_fd
, "\n");
140 /* We read from pack_objects.err to capture stderr output for
141 * progress bar, and pack_objects.out to capture the pack data.
145 struct pollfd pfd
[2];
146 int pe
, pu
, pollsize
;
154 if (0 <= pack_objects
.out
) {
155 pfd
[pollsize
].fd
= pack_objects
.out
;
156 pfd
[pollsize
].events
= POLLIN
;
160 if (0 <= pack_objects
.err
) {
161 pfd
[pollsize
].fd
= pack_objects
.err
;
162 pfd
[pollsize
].events
= POLLIN
;
170 ret
= poll(pfd
, pollsize
, 1000 * keepalive
);
172 if (errno
!= EINTR
) {
173 error("poll failed, resuming: %s",
179 if (0 <= pe
&& (pfd
[pe
].revents
& (POLLIN
|POLLHUP
))) {
180 /* Status ready; we ship that in the side-band
181 * or dump to the standard error.
183 sz
= xread(pack_objects
.err
, progress
,
186 send_client_data(2, progress
, sz
);
188 close(pack_objects
.err
);
189 pack_objects
.err
= -1;
193 /* give priority to status messages */
196 if (0 <= pu
&& (pfd
[pu
].revents
& (POLLIN
|POLLHUP
))) {
197 /* Data ready; we keep the last byte to ourselves
198 * in case we detect broken rev-list, so that we
199 * can leave the stream corrupted. This is
200 * unfortunate -- unpack-objects would happily
201 * accept a valid packdata with trailing garbage,
202 * so appending garbage after we pass all the
203 * pack data is not good enough to signal
204 * breakage to downstream.
212 sz
= xread(pack_objects
.out
, cp
,
213 sizeof(data
) - outsz
);
217 close(pack_objects
.out
);
218 pack_objects
.out
= -1;
224 buffered
= data
[sz
-1] & 0xFF;
229 sz
= send_client_data(1, data
, sz
);
235 * We hit the keepalive timeout without saying anything; send
236 * an empty message on the data sideband just to let the other
237 * side know we're still working on it, but don't have any data
240 * If we don't have a sideband channel, there's no room in the
241 * protocol to say anything, so those clients are just out of
244 if (!ret
&& use_sideband
) {
245 static const char buf
[] = "0005\1";
246 write_or_die(1, buf
, 5);
250 if (finish_command(&pack_objects
)) {
251 error("git upload-pack: git-pack-objects died with error.");
257 sz
= send_client_data(1, data
, 1);
260 fprintf(stderr
, "flushed.\n");
267 send_client_data(3, abort_msg
, sizeof(abort_msg
));
268 die("git upload-pack: %s", abort_msg
);
271 static int got_sha1(char *hex
, unsigned char *sha1
)
274 int we_knew_they_have
= 0;
276 if (get_sha1_hex(hex
, sha1
))
277 die("git upload-pack: expected SHA1 object, got '%s'", hex
);
278 if (!has_sha1_file(sha1
))
281 o
= parse_object(sha1
);
283 die("oops (%s)", sha1_to_hex(sha1
));
284 if (o
->type
== OBJ_COMMIT
) {
285 struct commit_list
*parents
;
286 struct commit
*commit
= (struct commit
*)o
;
287 if (o
->flags
& THEY_HAVE
)
288 we_knew_they_have
= 1;
290 o
->flags
|= THEY_HAVE
;
291 if (!oldest_have
|| (commit
->date
< oldest_have
))
292 oldest_have
= commit
->date
;
293 for (parents
= commit
->parents
;
295 parents
= parents
->next
)
296 parents
->item
->object
.flags
|= THEY_HAVE
;
298 if (!we_knew_they_have
) {
299 add_object_array(o
, NULL
, &have_obj
);
305 static int reachable(struct commit
*want
)
307 struct commit_list
*work
= NULL
;
309 commit_list_insert_by_date(want
, &work
);
311 struct commit_list
*list
= work
->next
;
312 struct commit
*commit
= work
->item
;
316 if (commit
->object
.flags
& THEY_HAVE
) {
317 want
->object
.flags
|= COMMON_KNOWN
;
320 if (!commit
->object
.parsed
)
321 parse_object(commit
->object
.sha1
);
322 if (commit
->object
.flags
& REACHABLE
)
324 commit
->object
.flags
|= REACHABLE
;
325 if (commit
->date
< oldest_have
)
327 for (list
= commit
->parents
; list
; list
= list
->next
) {
328 struct commit
*parent
= list
->item
;
329 if (!(parent
->object
.flags
& REACHABLE
))
330 commit_list_insert_by_date(parent
, &work
);
333 want
->object
.flags
|= REACHABLE
;
334 clear_commit_marks(want
, REACHABLE
);
335 free_commit_list(work
);
336 return (want
->object
.flags
& COMMON_KNOWN
);
339 static int ok_to_give_up(void)
346 for (i
= 0; i
< want_obj
.nr
; i
++) {
347 struct object
*want
= want_obj
.objects
[i
].item
;
349 if (want
->flags
& COMMON_KNOWN
)
351 want
= deref_tag(want
, "a want line", 0);
352 if (!want
|| want
->type
!= OBJ_COMMIT
) {
353 /* no way to tell if this is reachable by
354 * looking at the ancestry chain alone, so
355 * leave a note to ourselves not to worry about
356 * this object anymore.
358 want_obj
.objects
[i
].item
->flags
|= COMMON_KNOWN
;
361 if (!reachable((struct commit
*)want
))
367 static int get_common_commits(void)
369 unsigned char sha1
[20];
375 save_commit_buffer
= 0;
378 char *line
= packet_read_line(0, NULL
);
382 if (multi_ack
== 2 && got_common
383 && !got_other
&& ok_to_give_up()) {
385 packet_write(1, "ACK %s ready\n", last_hex
);
387 if (have_obj
.nr
== 0 || multi_ack
)
388 packet_write(1, "NAK\n");
390 if (no_done
&& sent_ready
) {
391 packet_write(1, "ACK %s\n", last_hex
);
400 if (starts_with(line
, "have ")) {
401 switch (got_sha1(line
+5, sha1
)) {
402 case -1: /* they have what we do not */
404 if (multi_ack
&& ok_to_give_up()) {
405 const char *hex
= sha1_to_hex(sha1
);
406 if (multi_ack
== 2) {
408 packet_write(1, "ACK %s ready\n", hex
);
410 packet_write(1, "ACK %s continue\n", hex
);
415 memcpy(last_hex
, sha1_to_hex(sha1
), 41);
417 packet_write(1, "ACK %s common\n", last_hex
);
419 packet_write(1, "ACK %s continue\n", last_hex
);
420 else if (have_obj
.nr
== 1)
421 packet_write(1, "ACK %s\n", last_hex
);
426 if (!strcmp(line
, "done")) {
427 if (have_obj
.nr
> 0) {
429 packet_write(1, "ACK %s\n", last_hex
);
432 packet_write(1, "NAK\n");
435 die("git upload-pack: expected SHA1 list, got '%s'", line
);
439 static int is_our_ref(struct object
*o
)
442 ((allow_tip_sha1_in_want
? HIDDEN_REF
: 0) | OUR_REF
);
445 static void check_non_tip(void)
447 static const char *argv
[] = {
448 "rev-list", "--stdin", NULL
,
450 static struct child_process cmd
;
452 char namebuf
[42]; /* ^ + SHA-1 + LF */
455 /* In the normal in-process case non-tip request can never happen */
465 if (start_command(&cmd
))
469 * If rev-list --stdin encounters an unknown commit, it
470 * terminates, which will cause SIGPIPE in the write loop
473 sigchain_push(SIGPIPE
, SIG_IGN
);
477 for (i
= get_max_object_index(); 0 < i
; ) {
478 o
= get_indexed_object(--i
);
483 memcpy(namebuf
+ 1, sha1_to_hex(o
->sha1
), 40);
484 if (write_in_full(cmd
.in
, namebuf
, 42) < 0)
488 for (i
= 0; i
< want_obj
.nr
; i
++) {
489 o
= want_obj
.objects
[i
].item
;
492 memcpy(namebuf
, sha1_to_hex(o
->sha1
), 40);
493 if (write_in_full(cmd
.in
, namebuf
, 41) < 0)
498 sigchain_pop(SIGPIPE
);
501 * The commits out of the rev-list are not ancestors of
504 i
= read_in_full(cmd
.out
, namebuf
, 1);
510 * rev-list may have died by encountering a bad commit
511 * in the history, in which case we do want to bail out
512 * even when it showed no commit.
514 if (finish_command(&cmd
))
517 /* All the non-tip ones are ancestors of what we advertised */
521 /* Pick one of them (we know there at least is one) */
522 for (i
= 0; i
< want_obj
.nr
; i
++) {
523 o
= want_obj
.objects
[i
].item
;
525 die("git upload-pack: not our ref %s",
526 sha1_to_hex(o
->sha1
));
530 static void receive_needs(void)
532 struct object_array shallows
= OBJECT_ARRAY_INIT
;
539 const char *features
;
540 unsigned char sha1_buf
[20];
541 char *line
= packet_read_line(0, NULL
);
546 if (starts_with(line
, "shallow ")) {
547 unsigned char sha1
[20];
548 struct object
*object
;
549 if (get_sha1_hex(line
+ 8, sha1
))
550 die("invalid shallow line: %s", line
);
551 object
= parse_object(sha1
);
554 if (object
->type
!= OBJ_COMMIT
)
555 die("invalid shallow object %s", sha1_to_hex(sha1
));
556 if (!(object
->flags
& CLIENT_SHALLOW
)) {
557 object
->flags
|= CLIENT_SHALLOW
;
558 add_object_array(object
, NULL
, &shallows
);
562 if (starts_with(line
, "deepen ")) {
564 depth
= strtol(line
+ 7, &end
, 0);
565 if (end
== line
+ 7 || depth
<= 0)
566 die("Invalid deepen: %s", line
);
569 if (!starts_with(line
, "want ") ||
570 get_sha1_hex(line
+5, sha1_buf
))
571 die("git upload-pack: protocol error, "
572 "expected to get sha, not '%s'", line
);
574 features
= line
+ 45;
576 if (parse_feature_request(features
, "multi_ack_detailed"))
578 else if (parse_feature_request(features
, "multi_ack"))
580 if (parse_feature_request(features
, "no-done"))
582 if (parse_feature_request(features
, "thin-pack"))
584 if (parse_feature_request(features
, "ofs-delta"))
586 if (parse_feature_request(features
, "side-band-64k"))
587 use_sideband
= LARGE_PACKET_MAX
;
588 else if (parse_feature_request(features
, "side-band"))
589 use_sideband
= DEFAULT_PACKET_MAX
;
590 if (parse_feature_request(features
, "no-progress"))
592 if (parse_feature_request(features
, "include-tag"))
595 o
= parse_object(sha1_buf
);
597 die("git upload-pack: not our ref %s",
598 sha1_to_hex(sha1_buf
));
599 if (!(o
->flags
& WANTED
)) {
603 add_object_array(o
, NULL
, &want_obj
);
608 * We have sent all our refs already, and the other end
609 * should have chosen out of them. When we are operating
610 * in the stateless RPC mode, however, their choice may
611 * have been based on the set of older refs advertised
612 * by another process that handled the initial request.
617 if (!use_sideband
&& daemon_mode
)
620 if (depth
== 0 && shallows
.nr
== 0)
623 struct commit_list
*result
= NULL
, *backup
= NULL
;
625 if (depth
== INFINITE_DEPTH
&& !is_repository_shallow())
626 for (i
= 0; i
< shallows
.nr
; i
++) {
627 struct object
*object
= shallows
.objects
[i
].item
;
628 object
->flags
|= NOT_SHALLOW
;
632 get_shallow_commits(&want_obj
, depth
,
633 SHALLOW
, NOT_SHALLOW
);
635 struct object
*object
= &result
->item
->object
;
636 if (!(object
->flags
& (CLIENT_SHALLOW
|NOT_SHALLOW
))) {
637 packet_write(1, "shallow %s",
638 sha1_to_hex(object
->sha1
));
639 register_shallow(object
->sha1
);
642 result
= result
->next
;
644 free_commit_list(backup
);
645 for (i
= 0; i
< shallows
.nr
; i
++) {
646 struct object
*object
= shallows
.objects
[i
].item
;
647 if (object
->flags
& NOT_SHALLOW
) {
648 struct commit_list
*parents
;
649 packet_write(1, "unshallow %s",
650 sha1_to_hex(object
->sha1
));
651 object
->flags
&= ~CLIENT_SHALLOW
;
652 /* make sure the real parents are parsed */
653 unregister_shallow(object
->sha1
);
655 parse_commit_or_die((struct commit
*)object
);
656 parents
= ((struct commit
*)object
)->parents
;
658 add_object_array(&parents
->item
->object
,
660 parents
= parents
->next
;
662 add_object_array(object
, NULL
, &extra_edge_obj
);
664 /* make sure commit traversal conforms to client */
665 register_shallow(object
->sha1
);
669 if (shallows
.nr
> 0) {
671 for (i
= 0; i
< shallows
.nr
; i
++)
672 register_shallow(shallows
.objects
[i
].item
->sha1
);
675 shallow_nr
+= shallows
.nr
;
676 free(shallows
.objects
);
679 /* return non-zero if the ref is hidden, otherwise 0 */
680 static int mark_our_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
682 struct object
*o
= lookup_unknown_object(sha1
);
684 if (ref_is_hidden(refname
)) {
685 o
->flags
|= HIDDEN_REF
;
689 die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1
));
694 static void format_symref_info(struct strbuf
*buf
, struct string_list
*symref
)
696 struct string_list_item
*item
;
700 for_each_string_list_item(item
, symref
)
701 strbuf_addf(buf
, " symref=%s:%s", item
->string
, (char *)item
->util
);
704 static int send_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
706 static const char *capabilities
= "multi_ack thin-pack side-band"
707 " side-band-64k ofs-delta shallow no-progress"
708 " include-tag multi_ack_detailed";
709 const char *refname_nons
= strip_namespace(refname
);
710 unsigned char peeled
[20];
712 if (mark_our_ref(refname
, sha1
, flag
, NULL
))
716 struct strbuf symref_info
= STRBUF_INIT
;
718 format_symref_info(&symref_info
, cb_data
);
719 packet_write(1, "%s %s%c%s%s%s%s agent=%s\n",
720 sha1_to_hex(sha1
), refname_nons
,
722 allow_tip_sha1_in_want
? " allow-tip-sha1-in-want" : "",
723 stateless_rpc
? " no-done" : "",
725 git_user_agent_sanitized());
726 strbuf_release(&symref_info
);
728 packet_write(1, "%s %s\n", sha1_to_hex(sha1
), refname_nons
);
731 if (!peel_ref(refname
, peeled
))
732 packet_write(1, "%s %s^{}\n", sha1_to_hex(peeled
), refname_nons
);
736 static int find_symref(const char *refname
, const unsigned char *sha1
, int flag
,
739 const char *symref_target
;
740 struct string_list_item
*item
;
741 unsigned char unused
[20];
743 if ((flag
& REF_ISSYMREF
) == 0)
745 symref_target
= resolve_ref_unsafe(refname
, unused
, 0, &flag
);
746 if (!symref_target
|| (flag
& REF_ISSYMREF
) == 0)
747 die("'%s' is a symref but it is not?", refname
);
748 item
= string_list_append(cb_data
, refname
);
749 item
->util
= xstrdup(symref_target
);
753 static void upload_pack(void)
755 struct string_list symref
= STRING_LIST_INIT_DUP
;
757 head_ref_namespaced(find_symref
, &symref
);
759 if (advertise_refs
|| !stateless_rpc
) {
761 head_ref_namespaced(send_ref
, &symref
);
762 for_each_namespaced_ref(send_ref
, &symref
);
763 advertise_shallow_grafts(1);
766 head_ref_namespaced(mark_our_ref
, NULL
);
767 for_each_namespaced_ref(mark_our_ref
, NULL
);
769 string_list_clear(&symref
, 1);
775 get_common_commits();
780 static int upload_pack_config(const char *var
, const char *value
, void *unused
)
782 if (!strcmp("uploadpack.allowtipsha1inwant", var
))
783 allow_tip_sha1_in_want
= git_config_bool(var
, value
);
784 else if (!strcmp("uploadpack.keepalive", var
)) {
785 keepalive
= git_config_int(var
, value
);
789 return parse_hide_refs_config(var
, value
, "uploadpack");
792 int main(int argc
, char **argv
)
800 packet_trace_identity("upload-pack");
801 git_extract_argv0_path(argv
[0]);
802 read_replace_refs
= 0;
804 for (i
= 1; i
< argc
; i
++) {
809 if (!strcmp(arg
, "--advertise-refs")) {
813 if (!strcmp(arg
, "--stateless-rpc")) {
817 if (!strcmp(arg
, "--strict")) {
821 if (starts_with(arg
, "--timeout=")) {
822 timeout
= atoi(arg
+10);
826 if (!strcmp(arg
, "--")) {
833 usage(upload_pack_usage
);
839 if (!enter_repo(dir
, strict
))
840 die("'%s' does not appear to be a git repository", dir
);
842 git_config(upload_pack_config
, NULL
);