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 void create_pack_file(void)
75 struct child_process pack_objects
;
76 char data
[8193], progress
[128];
77 char abort_msg
[] = "aborting due to possible repository "
78 "corruption on the remote side.";
84 char *shallow_file
= NULL
;
87 shallow_file
= setup_temporary_shallow(NULL
);
88 argv
[arg
++] = "--shallow-file";
89 argv
[arg
++] = shallow_file
;
91 argv
[arg
++] = "pack-objects";
92 argv
[arg
++] = "--revs";
94 argv
[arg
++] = "--thin";
96 argv
[arg
++] = "--stdout";
98 argv
[arg
++] = "--progress";
100 argv
[arg
++] = "--delta-base-offset";
102 argv
[arg
++] = "--include-tag";
105 memset(&pack_objects
, 0, sizeof(pack_objects
));
106 pack_objects
.in
= -1;
107 pack_objects
.out
= -1;
108 pack_objects
.err
= -1;
109 pack_objects
.git_cmd
= 1;
110 pack_objects
.argv
= argv
;
112 if (start_command(&pack_objects
))
113 die("git upload-pack: unable to fork git-pack-objects");
115 pipe_fd
= xfdopen(pack_objects
.in
, "w");
117 for (i
= 0; i
< want_obj
.nr
; i
++)
118 fprintf(pipe_fd
, "%s\n",
119 sha1_to_hex(want_obj
.objects
[i
].item
->sha1
));
120 fprintf(pipe_fd
, "--not\n");
121 for (i
= 0; i
< have_obj
.nr
; i
++)
122 fprintf(pipe_fd
, "%s\n",
123 sha1_to_hex(have_obj
.objects
[i
].item
->sha1
));
124 for (i
= 0; i
< extra_edge_obj
.nr
; i
++)
125 fprintf(pipe_fd
, "%s\n",
126 sha1_to_hex(extra_edge_obj
.objects
[i
].item
->sha1
));
127 fprintf(pipe_fd
, "\n");
131 /* We read from pack_objects.err to capture stderr output for
132 * progress bar, and pack_objects.out to capture the pack data.
136 struct pollfd pfd
[2];
137 int pe
, pu
, pollsize
;
145 if (0 <= pack_objects
.out
) {
146 pfd
[pollsize
].fd
= pack_objects
.out
;
147 pfd
[pollsize
].events
= POLLIN
;
151 if (0 <= pack_objects
.err
) {
152 pfd
[pollsize
].fd
= pack_objects
.err
;
153 pfd
[pollsize
].events
= POLLIN
;
161 ret
= poll(pfd
, pollsize
, 1000 * keepalive
);
163 if (errno
!= EINTR
) {
164 error("poll failed, resuming: %s",
170 if (0 <= pe
&& (pfd
[pe
].revents
& (POLLIN
|POLLHUP
))) {
171 /* Status ready; we ship that in the side-band
172 * or dump to the standard error.
174 sz
= xread(pack_objects
.err
, progress
,
177 send_client_data(2, progress
, sz
);
179 close(pack_objects
.err
);
180 pack_objects
.err
= -1;
184 /* give priority to status messages */
187 if (0 <= pu
&& (pfd
[pu
].revents
& (POLLIN
|POLLHUP
))) {
188 /* Data ready; we keep the last byte to ourselves
189 * in case we detect broken rev-list, so that we
190 * can leave the stream corrupted. This is
191 * unfortunate -- unpack-objects would happily
192 * accept a valid packdata with trailing garbage,
193 * so appending garbage after we pass all the
194 * pack data is not good enough to signal
195 * breakage to downstream.
203 sz
= xread(pack_objects
.out
, cp
,
204 sizeof(data
) - outsz
);
208 close(pack_objects
.out
);
209 pack_objects
.out
= -1;
215 buffered
= data
[sz
-1] & 0xFF;
220 sz
= send_client_data(1, data
, sz
);
226 * We hit the keepalive timeout without saying anything; send
227 * an empty message on the data sideband just to let the other
228 * side know we're still working on it, but don't have any data
231 * If we don't have a sideband channel, there's no room in the
232 * protocol to say anything, so those clients are just out of
235 if (!ret
&& use_sideband
) {
236 static const char buf
[] = "0005\1";
237 write_or_die(1, buf
, 5);
241 if (finish_command(&pack_objects
)) {
242 error("git upload-pack: git-pack-objects died with error.");
247 unlink(shallow_file
);
254 sz
= send_client_data(1, data
, 1);
257 fprintf(stderr
, "flushed.\n");
264 send_client_data(3, abort_msg
, sizeof(abort_msg
));
265 die("git upload-pack: %s", abort_msg
);
268 static int got_sha1(char *hex
, unsigned char *sha1
)
271 int we_knew_they_have
= 0;
273 if (get_sha1_hex(hex
, sha1
))
274 die("git upload-pack: expected SHA1 object, got '%s'", hex
);
275 if (!has_sha1_file(sha1
))
278 o
= parse_object(sha1
);
280 die("oops (%s)", sha1_to_hex(sha1
));
281 if (o
->type
== OBJ_COMMIT
) {
282 struct commit_list
*parents
;
283 struct commit
*commit
= (struct commit
*)o
;
284 if (o
->flags
& THEY_HAVE
)
285 we_knew_they_have
= 1;
287 o
->flags
|= THEY_HAVE
;
288 if (!oldest_have
|| (commit
->date
< oldest_have
))
289 oldest_have
= commit
->date
;
290 for (parents
= commit
->parents
;
292 parents
= parents
->next
)
293 parents
->item
->object
.flags
|= THEY_HAVE
;
295 if (!we_knew_they_have
) {
296 add_object_array(o
, NULL
, &have_obj
);
302 static int reachable(struct commit
*want
)
304 struct commit_list
*work
= NULL
;
306 commit_list_insert_by_date(want
, &work
);
308 struct commit_list
*list
= work
->next
;
309 struct commit
*commit
= work
->item
;
313 if (commit
->object
.flags
& THEY_HAVE
) {
314 want
->object
.flags
|= COMMON_KNOWN
;
317 if (!commit
->object
.parsed
)
318 parse_object(commit
->object
.sha1
);
319 if (commit
->object
.flags
& REACHABLE
)
321 commit
->object
.flags
|= REACHABLE
;
322 if (commit
->date
< oldest_have
)
324 for (list
= commit
->parents
; list
; list
= list
->next
) {
325 struct commit
*parent
= list
->item
;
326 if (!(parent
->object
.flags
& REACHABLE
))
327 commit_list_insert_by_date(parent
, &work
);
330 want
->object
.flags
|= REACHABLE
;
331 clear_commit_marks(want
, REACHABLE
);
332 free_commit_list(work
);
333 return (want
->object
.flags
& COMMON_KNOWN
);
336 static int ok_to_give_up(void)
343 for (i
= 0; i
< want_obj
.nr
; i
++) {
344 struct object
*want
= want_obj
.objects
[i
].item
;
346 if (want
->flags
& COMMON_KNOWN
)
348 want
= deref_tag(want
, "a want line", 0);
349 if (!want
|| want
->type
!= OBJ_COMMIT
) {
350 /* no way to tell if this is reachable by
351 * looking at the ancestry chain alone, so
352 * leave a note to ourselves not to worry about
353 * this object anymore.
355 want_obj
.objects
[i
].item
->flags
|= COMMON_KNOWN
;
358 if (!reachable((struct commit
*)want
))
364 static int get_common_commits(void)
366 unsigned char sha1
[20];
372 save_commit_buffer
= 0;
375 char *line
= packet_read_line(0, NULL
);
379 if (multi_ack
== 2 && got_common
380 && !got_other
&& ok_to_give_up()) {
382 packet_write(1, "ACK %s ready\n", last_hex
);
384 if (have_obj
.nr
== 0 || multi_ack
)
385 packet_write(1, "NAK\n");
387 if (no_done
&& sent_ready
) {
388 packet_write(1, "ACK %s\n", last_hex
);
397 if (!prefixcmp(line
, "have ")) {
398 switch (got_sha1(line
+5, sha1
)) {
399 case -1: /* they have what we do not */
401 if (multi_ack
&& ok_to_give_up()) {
402 const char *hex
= sha1_to_hex(sha1
);
403 if (multi_ack
== 2) {
405 packet_write(1, "ACK %s ready\n", hex
);
407 packet_write(1, "ACK %s continue\n", hex
);
412 memcpy(last_hex
, sha1_to_hex(sha1
), 41);
414 packet_write(1, "ACK %s common\n", last_hex
);
416 packet_write(1, "ACK %s continue\n", last_hex
);
417 else if (have_obj
.nr
== 1)
418 packet_write(1, "ACK %s\n", last_hex
);
423 if (!strcmp(line
, "done")) {
424 if (have_obj
.nr
> 0) {
426 packet_write(1, "ACK %s\n", last_hex
);
429 packet_write(1, "NAK\n");
432 die("git upload-pack: expected SHA1 list, got '%s'", line
);
436 static int is_our_ref(struct object
*o
)
439 ((allow_tip_sha1_in_want
? HIDDEN_REF
: 0) | OUR_REF
);
442 static void check_non_tip(void)
444 static const char *argv
[] = {
445 "rev-list", "--stdin", NULL
,
447 static struct child_process cmd
;
449 char namebuf
[42]; /* ^ + SHA-1 + LF */
452 /* In the normal in-process case non-tip request can never happen */
462 if (start_command(&cmd
))
466 * If rev-list --stdin encounters an unknown commit, it
467 * terminates, which will cause SIGPIPE in the write loop
470 sigchain_push(SIGPIPE
, SIG_IGN
);
474 for (i
= get_max_object_index(); 0 < i
; ) {
475 o
= get_indexed_object(--i
);
480 memcpy(namebuf
+ 1, sha1_to_hex(o
->sha1
), 40);
481 if (write_in_full(cmd
.in
, namebuf
, 42) < 0)
485 for (i
= 0; i
< want_obj
.nr
; i
++) {
486 o
= want_obj
.objects
[i
].item
;
489 memcpy(namebuf
, sha1_to_hex(o
->sha1
), 40);
490 if (write_in_full(cmd
.in
, namebuf
, 41) < 0)
495 sigchain_pop(SIGPIPE
);
498 * The commits out of the rev-list are not ancestors of
501 i
= read_in_full(cmd
.out
, namebuf
, 1);
507 * rev-list may have died by encountering a bad commit
508 * in the history, in which case we do want to bail out
509 * even when it showed no commit.
511 if (finish_command(&cmd
))
514 /* All the non-tip ones are ancestors of what we advertised */
518 /* Pick one of them (we know there at least is one) */
519 for (i
= 0; i
< want_obj
.nr
; i
++) {
520 o
= want_obj
.objects
[i
].item
;
522 die("git upload-pack: not our ref %s",
523 sha1_to_hex(o
->sha1
));
527 static void receive_needs(void)
529 struct object_array shallows
= OBJECT_ARRAY_INIT
;
536 const char *features
;
537 unsigned char sha1_buf
[20];
538 char *line
= packet_read_line(0, NULL
);
543 if (!prefixcmp(line
, "shallow ")) {
544 unsigned char sha1
[20];
545 struct object
*object
;
546 if (get_sha1_hex(line
+ 8, sha1
))
547 die("invalid shallow line: %s", line
);
548 object
= parse_object(sha1
);
551 if (object
->type
!= OBJ_COMMIT
)
552 die("invalid shallow object %s", sha1_to_hex(sha1
));
553 if (!(object
->flags
& CLIENT_SHALLOW
)) {
554 object
->flags
|= CLIENT_SHALLOW
;
555 add_object_array(object
, NULL
, &shallows
);
559 if (!prefixcmp(line
, "deepen ")) {
561 depth
= strtol(line
+ 7, &end
, 0);
562 if (end
== line
+ 7 || depth
<= 0)
563 die("Invalid deepen: %s", line
);
566 if (prefixcmp(line
, "want ") ||
567 get_sha1_hex(line
+5, sha1_buf
))
568 die("git upload-pack: protocol error, "
569 "expected to get sha, not '%s'", line
);
571 features
= line
+ 45;
573 if (parse_feature_request(features
, "multi_ack_detailed"))
575 else if (parse_feature_request(features
, "multi_ack"))
577 if (parse_feature_request(features
, "no-done"))
579 if (parse_feature_request(features
, "thin-pack"))
581 if (parse_feature_request(features
, "ofs-delta"))
583 if (parse_feature_request(features
, "side-band-64k"))
584 use_sideband
= LARGE_PACKET_MAX
;
585 else if (parse_feature_request(features
, "side-band"))
586 use_sideband
= DEFAULT_PACKET_MAX
;
587 if (parse_feature_request(features
, "no-progress"))
589 if (parse_feature_request(features
, "include-tag"))
592 o
= parse_object(sha1_buf
);
594 die("git upload-pack: not our ref %s",
595 sha1_to_hex(sha1_buf
));
596 if (!(o
->flags
& WANTED
)) {
600 add_object_array(o
, NULL
, &want_obj
);
605 * We have sent all our refs already, and the other end
606 * should have chosen out of them. When we are operating
607 * in the stateless RPC mode, however, their choice may
608 * have been based on the set of older refs advertised
609 * by another process that handled the initial request.
614 if (!use_sideband
&& daemon_mode
)
617 if (depth
== 0 && shallows
.nr
== 0)
620 struct commit_list
*result
= NULL
, *backup
= NULL
;
622 if (depth
== INFINITE_DEPTH
&& !is_repository_shallow())
623 for (i
= 0; i
< shallows
.nr
; i
++) {
624 struct object
*object
= shallows
.objects
[i
].item
;
625 object
->flags
|= NOT_SHALLOW
;
629 get_shallow_commits(&want_obj
, depth
,
630 SHALLOW
, NOT_SHALLOW
);
632 struct object
*object
= &result
->item
->object
;
633 if (!(object
->flags
& (CLIENT_SHALLOW
|NOT_SHALLOW
))) {
634 packet_write(1, "shallow %s",
635 sha1_to_hex(object
->sha1
));
636 register_shallow(object
->sha1
);
639 result
= result
->next
;
641 free_commit_list(backup
);
642 for (i
= 0; i
< shallows
.nr
; i
++) {
643 struct object
*object
= shallows
.objects
[i
].item
;
644 if (object
->flags
& NOT_SHALLOW
) {
645 struct commit_list
*parents
;
646 packet_write(1, "unshallow %s",
647 sha1_to_hex(object
->sha1
));
648 object
->flags
&= ~CLIENT_SHALLOW
;
649 /* make sure the real parents are parsed */
650 unregister_shallow(object
->sha1
);
652 if (parse_commit((struct commit
*)object
))
653 die("invalid commit");
654 parents
= ((struct commit
*)object
)->parents
;
656 add_object_array(&parents
->item
->object
,
658 parents
= parents
->next
;
660 add_object_array(object
, NULL
, &extra_edge_obj
);
662 /* make sure commit traversal conforms to client */
663 register_shallow(object
->sha1
);
667 if (shallows
.nr
> 0) {
669 for (i
= 0; i
< shallows
.nr
; i
++)
670 register_shallow(shallows
.objects
[i
].item
->sha1
);
673 shallow_nr
+= shallows
.nr
;
674 free(shallows
.objects
);
677 /* return non-zero if the ref is hidden, otherwise 0 */
678 static int mark_our_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
680 struct object
*o
= lookup_unknown_object(sha1
);
682 if (ref_is_hidden(refname
)) {
683 o
->flags
|= HIDDEN_REF
;
687 die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1
));
692 static void format_symref_info(struct strbuf
*buf
, struct string_list
*symref
)
694 struct string_list_item
*item
;
698 for_each_string_list_item(item
, symref
)
699 strbuf_addf(buf
, " symref=%s:%s", item
->string
, (char *)item
->util
);
702 static int send_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
704 static const char *capabilities
= "multi_ack thin-pack side-band"
705 " side-band-64k ofs-delta shallow no-progress"
706 " include-tag multi_ack_detailed";
707 const char *refname_nons
= strip_namespace(refname
);
708 unsigned char peeled
[20];
710 if (mark_our_ref(refname
, sha1
, flag
, NULL
))
714 struct strbuf symref_info
= STRBUF_INIT
;
716 format_symref_info(&symref_info
, cb_data
);
717 packet_write(1, "%s %s%c%s%s%s%s agent=%s\n",
718 sha1_to_hex(sha1
), refname_nons
,
720 allow_tip_sha1_in_want
? " allow-tip-sha1-in-want" : "",
721 stateless_rpc
? " no-done" : "",
723 git_user_agent_sanitized());
724 strbuf_release(&symref_info
);
726 packet_write(1, "%s %s\n", sha1_to_hex(sha1
), refname_nons
);
729 if (!peel_ref(refname
, peeled
))
730 packet_write(1, "%s %s^{}\n", sha1_to_hex(peeled
), refname_nons
);
734 static int find_symref(const char *refname
, const unsigned char *sha1
, int flag
,
737 const char *symref_target
;
738 struct string_list_item
*item
;
739 unsigned char unused
[20];
741 if ((flag
& REF_ISSYMREF
) == 0)
743 symref_target
= resolve_ref_unsafe(refname
, unused
, 0, &flag
);
744 if (!symref_target
|| (flag
& REF_ISSYMREF
) == 0)
745 die("'%s' is a symref but it is not?", refname
);
746 item
= string_list_append(cb_data
, refname
);
747 item
->util
= xstrdup(symref_target
);
751 static void upload_pack(void)
753 struct string_list symref
= STRING_LIST_INIT_DUP
;
755 head_ref_namespaced(find_symref
, &symref
);
757 if (advertise_refs
|| !stateless_rpc
) {
759 head_ref_namespaced(send_ref
, &symref
);
760 for_each_namespaced_ref(send_ref
, &symref
);
761 advertise_shallow_grafts(1);
764 head_ref_namespaced(mark_our_ref
, NULL
);
765 for_each_namespaced_ref(mark_our_ref
, NULL
);
767 string_list_clear(&symref
, 1);
773 get_common_commits();
778 static int upload_pack_config(const char *var
, const char *value
, void *unused
)
780 if (!strcmp("uploadpack.allowtipsha1inwant", var
))
781 allow_tip_sha1_in_want
= git_config_bool(var
, value
);
782 else if (!strcmp("uploadpack.keepalive", var
)) {
783 keepalive
= git_config_int(var
, value
);
787 return parse_hide_refs_config(var
, value
, "uploadpack");
790 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
);
840 git_config(upload_pack_config
, NULL
);