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
;
47 static int advertise_refs
;
48 static int stateless_rpc
;
50 static void reset_timeout(void)
55 static ssize_t
send_client_data(int fd
, const char *data
, ssize_t sz
)
58 return send_sideband(1, fd
, data
, sz
, use_sideband
);
63 /* XXX: are we happy to lose stuff here? */
67 write_or_die(fd
, data
, sz
);
71 static FILE *pack_pipe
= NULL
;
72 static void show_commit(struct commit
*commit
, void *data
)
74 if (commit
->object
.flags
& BOUNDARY
)
75 fputc('-', pack_pipe
);
76 if (fputs(sha1_to_hex(commit
->object
.sha1
), pack_pipe
) < 0)
77 die("broken output pipe");
78 fputc('\n', pack_pipe
);
81 commit
->buffer
= NULL
;
84 static void show_object(struct object
*obj
,
85 const struct name_path
*path
, const char *component
,
88 show_object_with_name(pack_pipe
, obj
, path
, component
);
91 static void show_edge(struct commit
*commit
)
93 fprintf(pack_pipe
, "-%s\n", sha1_to_hex(commit
->object
.sha1
));
96 static int do_rev_list(int in
, int out
, void *user_data
)
101 pack_pipe
= xfdopen(out
, "w");
102 init_revisions(&revs
, NULL
);
103 revs
.tag_objects
= 1;
104 revs
.tree_objects
= 1;
105 revs
.blob_objects
= 1;
109 for (i
= 0; i
< want_obj
.nr
; i
++) {
110 struct object
*o
= want_obj
.objects
[i
].item
;
112 o
->flags
&= ~UNINTERESTING
;
113 add_pending_object(&revs
, o
, NULL
);
115 for (i
= 0; i
< have_obj
.nr
; i
++) {
116 struct object
*o
= have_obj
.objects
[i
].item
;
117 o
->flags
|= UNINTERESTING
;
118 add_pending_object(&revs
, o
, NULL
);
120 setup_revisions(0, NULL
, &revs
, NULL
);
121 if (prepare_revision_walk(&revs
))
122 die("revision walk setup failed");
123 mark_edges_uninteresting(revs
.commits
, &revs
, show_edge
);
125 for (i
= 0; i
< extra_edge_obj
.nr
; i
++)
126 fprintf(pack_pipe
, "-%s\n", sha1_to_hex(
127 extra_edge_obj
.objects
[i
].item
->sha1
));
128 traverse_commit_list(&revs
, show_commit
, show_object
, NULL
);
134 static void create_pack_file(void)
136 struct async rev_list
;
137 struct child_process pack_objects
;
138 char data
[8193], progress
[128];
139 char abort_msg
[] = "aborting due to possible repository "
140 "corruption on the remote side.";
143 const char *argv
[10];
146 argv
[arg
++] = "pack-objects";
148 argv
[arg
++] = "--revs";
150 argv
[arg
++] = "--thin";
153 argv
[arg
++] = "--stdout";
155 argv
[arg
++] = "--progress";
157 argv
[arg
++] = "--delta-base-offset";
159 argv
[arg
++] = "--include-tag";
162 memset(&pack_objects
, 0, sizeof(pack_objects
));
163 pack_objects
.in
= -1;
164 pack_objects
.out
= -1;
165 pack_objects
.err
= -1;
166 pack_objects
.git_cmd
= 1;
167 pack_objects
.argv
= argv
;
169 if (start_command(&pack_objects
))
170 die("git upload-pack: unable to fork git-pack-objects");
173 memset(&rev_list
, 0, sizeof(rev_list
));
174 rev_list
.proc
= do_rev_list
;
175 rev_list
.out
= pack_objects
.in
;
176 if (start_async(&rev_list
))
177 die("git upload-pack: unable to fork git-rev-list");
180 FILE *pipe_fd
= xfdopen(pack_objects
.in
, "w");
183 for (i
= 0; i
< want_obj
.nr
; i
++)
184 fprintf(pipe_fd
, "%s\n",
185 sha1_to_hex(want_obj
.objects
[i
].item
->sha1
));
186 fprintf(pipe_fd
, "--not\n");
187 for (i
= 0; i
< have_obj
.nr
; i
++)
188 fprintf(pipe_fd
, "%s\n",
189 sha1_to_hex(have_obj
.objects
[i
].item
->sha1
));
190 fprintf(pipe_fd
, "\n");
196 /* We read from pack_objects.err to capture stderr output for
197 * progress bar, and pack_objects.out to capture the pack data.
201 struct pollfd pfd
[2];
202 int pe
, pu
, pollsize
;
209 if (0 <= pack_objects
.out
) {
210 pfd
[pollsize
].fd
= pack_objects
.out
;
211 pfd
[pollsize
].events
= POLLIN
;
215 if (0 <= pack_objects
.err
) {
216 pfd
[pollsize
].fd
= pack_objects
.err
;
217 pfd
[pollsize
].events
= POLLIN
;
225 if (poll(pfd
, pollsize
, -1) < 0) {
226 if (errno
!= EINTR
) {
227 error("poll failed, resuming: %s",
233 if (0 <= pe
&& (pfd
[pe
].revents
& (POLLIN
|POLLHUP
))) {
234 /* Status ready; we ship that in the side-band
235 * or dump to the standard error.
237 sz
= xread(pack_objects
.err
, progress
,
240 send_client_data(2, progress
, sz
);
242 close(pack_objects
.err
);
243 pack_objects
.err
= -1;
247 /* give priority to status messages */
250 if (0 <= pu
&& (pfd
[pu
].revents
& (POLLIN
|POLLHUP
))) {
251 /* Data ready; we keep the last byte to ourselves
252 * in case we detect broken rev-list, so that we
253 * can leave the stream corrupted. This is
254 * unfortunate -- unpack-objects would happily
255 * accept a valid packdata with trailing garbage,
256 * so appending garbage after we pass all the
257 * pack data is not good enough to signal
258 * breakage to downstream.
266 sz
= xread(pack_objects
.out
, cp
,
267 sizeof(data
) - outsz
);
271 close(pack_objects
.out
);
272 pack_objects
.out
= -1;
278 buffered
= data
[sz
-1] & 0xFF;
283 sz
= send_client_data(1, data
, sz
);
289 if (finish_command(&pack_objects
)) {
290 error("git upload-pack: git-pack-objects died with error.");
293 if (shallow_nr
&& finish_async(&rev_list
))
294 goto fail
; /* error was already reported */
299 sz
= send_client_data(1, data
, 1);
302 fprintf(stderr
, "flushed.\n");
309 send_client_data(3, abort_msg
, sizeof(abort_msg
));
310 die("git upload-pack: %s", abort_msg
);
313 static int got_sha1(char *hex
, unsigned char *sha1
)
316 int we_knew_they_have
= 0;
318 if (get_sha1_hex(hex
, sha1
))
319 die("git upload-pack: expected SHA1 object, got '%s'", hex
);
320 if (!has_sha1_file(sha1
))
323 o
= parse_object(sha1
);
325 die("oops (%s)", sha1_to_hex(sha1
));
326 if (o
->type
== OBJ_COMMIT
) {
327 struct commit_list
*parents
;
328 struct commit
*commit
= (struct commit
*)o
;
329 if (o
->flags
& THEY_HAVE
)
330 we_knew_they_have
= 1;
332 o
->flags
|= THEY_HAVE
;
333 if (!oldest_have
|| (commit
->date
< oldest_have
))
334 oldest_have
= commit
->date
;
335 for (parents
= commit
->parents
;
337 parents
= parents
->next
)
338 parents
->item
->object
.flags
|= THEY_HAVE
;
340 if (!we_knew_they_have
) {
341 add_object_array(o
, NULL
, &have_obj
);
347 static int reachable(struct commit
*want
)
349 struct commit_list
*work
= NULL
;
351 commit_list_insert_by_date(want
, &work
);
353 struct commit_list
*list
= work
->next
;
354 struct commit
*commit
= work
->item
;
358 if (commit
->object
.flags
& THEY_HAVE
) {
359 want
->object
.flags
|= COMMON_KNOWN
;
362 if (!commit
->object
.parsed
)
363 parse_object(commit
->object
.sha1
);
364 if (commit
->object
.flags
& REACHABLE
)
366 commit
->object
.flags
|= REACHABLE
;
367 if (commit
->date
< oldest_have
)
369 for (list
= commit
->parents
; list
; list
= list
->next
) {
370 struct commit
*parent
= list
->item
;
371 if (!(parent
->object
.flags
& REACHABLE
))
372 commit_list_insert_by_date(parent
, &work
);
375 want
->object
.flags
|= REACHABLE
;
376 clear_commit_marks(want
, REACHABLE
);
377 free_commit_list(work
);
378 return (want
->object
.flags
& COMMON_KNOWN
);
381 static int ok_to_give_up(void)
388 for (i
= 0; i
< want_obj
.nr
; i
++) {
389 struct object
*want
= want_obj
.objects
[i
].item
;
391 if (want
->flags
& COMMON_KNOWN
)
393 want
= deref_tag(want
, "a want line", 0);
394 if (!want
|| want
->type
!= OBJ_COMMIT
) {
395 /* no way to tell if this is reachable by
396 * looking at the ancestry chain alone, so
397 * leave a note to ourselves not to worry about
398 * this object anymore.
400 want_obj
.objects
[i
].item
->flags
|= COMMON_KNOWN
;
403 if (!reachable((struct commit
*)want
))
409 static int get_common_commits(void)
411 unsigned char sha1
[20];
417 save_commit_buffer
= 0;
420 char *line
= packet_read_line(0, NULL
);
424 if (multi_ack
== 2 && got_common
425 && !got_other
&& ok_to_give_up()) {
427 packet_write(1, "ACK %s ready\n", last_hex
);
429 if (have_obj
.nr
== 0 || multi_ack
)
430 packet_write(1, "NAK\n");
432 if (no_done
&& sent_ready
) {
433 packet_write(1, "ACK %s\n", last_hex
);
442 if (!prefixcmp(line
, "have ")) {
443 switch (got_sha1(line
+5, sha1
)) {
444 case -1: /* they have what we do not */
446 if (multi_ack
&& ok_to_give_up()) {
447 const char *hex
= sha1_to_hex(sha1
);
448 if (multi_ack
== 2) {
450 packet_write(1, "ACK %s ready\n", hex
);
452 packet_write(1, "ACK %s continue\n", hex
);
457 memcpy(last_hex
, sha1_to_hex(sha1
), 41);
459 packet_write(1, "ACK %s common\n", last_hex
);
461 packet_write(1, "ACK %s continue\n", last_hex
);
462 else if (have_obj
.nr
== 1)
463 packet_write(1, "ACK %s\n", last_hex
);
468 if (!strcmp(line
, "done")) {
469 if (have_obj
.nr
> 0) {
471 packet_write(1, "ACK %s\n", last_hex
);
474 packet_write(1, "NAK\n");
477 die("git upload-pack: expected SHA1 list, got '%s'", line
);
481 static int is_our_ref(struct object
*o
)
484 ((allow_tip_sha1_in_want
? HIDDEN_REF
: 0) | OUR_REF
);
487 static void check_non_tip(void)
489 static const char *argv
[] = {
490 "rev-list", "--stdin", NULL
,
492 static struct child_process cmd
;
494 char namebuf
[42]; /* ^ + SHA-1 + LF */
497 /* In the normal in-process case non-tip request can never happen */
507 if (start_command(&cmd
))
511 * If rev-list --stdin encounters an unknown commit, it
512 * terminates, which will cause SIGPIPE in the write loop
515 sigchain_push(SIGPIPE
, SIG_IGN
);
519 for (i
= get_max_object_index(); 0 < i
; ) {
520 o
= get_indexed_object(--i
);
525 memcpy(namebuf
+ 1, sha1_to_hex(o
->sha1
), 40);
526 if (write_in_full(cmd
.in
, namebuf
, 42) < 0)
530 for (i
= 0; i
< want_obj
.nr
; i
++) {
531 o
= want_obj
.objects
[i
].item
;
534 memcpy(namebuf
, sha1_to_hex(o
->sha1
), 40);
535 if (write_in_full(cmd
.in
, namebuf
, 41) < 0)
540 sigchain_pop(SIGPIPE
);
543 * The commits out of the rev-list are not ancestors of
546 i
= read_in_full(cmd
.out
, namebuf
, 1);
552 * rev-list may have died by encountering a bad commit
553 * in the history, in which case we do want to bail out
554 * even when it showed no commit.
556 if (finish_command(&cmd
))
559 /* All the non-tip ones are ancestors of what we advertised */
563 /* Pick one of them (we know there at least is one) */
564 for (i
= 0; i
< want_obj
.nr
; i
++) {
565 o
= want_obj
.objects
[i
].item
;
567 die("git upload-pack: not our ref %s",
568 sha1_to_hex(o
->sha1
));
572 static void receive_needs(void)
574 struct object_array shallows
= OBJECT_ARRAY_INIT
;
581 const char *features
;
582 unsigned char sha1_buf
[20];
583 char *line
= packet_read_line(0, NULL
);
588 if (!prefixcmp(line
, "shallow ")) {
589 unsigned char sha1
[20];
590 struct object
*object
;
591 if (get_sha1_hex(line
+ 8, sha1
))
592 die("invalid shallow line: %s", line
);
593 object
= parse_object(sha1
);
596 if (object
->type
!= OBJ_COMMIT
)
597 die("invalid shallow object %s", sha1_to_hex(sha1
));
598 if (!(object
->flags
& CLIENT_SHALLOW
)) {
599 object
->flags
|= CLIENT_SHALLOW
;
600 add_object_array(object
, NULL
, &shallows
);
604 if (!prefixcmp(line
, "deepen ")) {
606 depth
= strtol(line
+ 7, &end
, 0);
607 if (end
== line
+ 7 || depth
<= 0)
608 die("Invalid deepen: %s", line
);
611 if (prefixcmp(line
, "want ") ||
612 get_sha1_hex(line
+5, sha1_buf
))
613 die("git upload-pack: protocol error, "
614 "expected to get sha, not '%s'", line
);
616 features
= line
+ 45;
618 if (parse_feature_request(features
, "multi_ack_detailed"))
620 else if (parse_feature_request(features
, "multi_ack"))
622 if (parse_feature_request(features
, "no-done"))
624 if (parse_feature_request(features
, "thin-pack"))
626 if (parse_feature_request(features
, "ofs-delta"))
628 if (parse_feature_request(features
, "side-band-64k"))
629 use_sideband
= LARGE_PACKET_MAX
;
630 else if (parse_feature_request(features
, "side-band"))
631 use_sideband
= DEFAULT_PACKET_MAX
;
632 if (parse_feature_request(features
, "no-progress"))
634 if (parse_feature_request(features
, "include-tag"))
637 o
= parse_object(sha1_buf
);
639 die("git upload-pack: not our ref %s",
640 sha1_to_hex(sha1_buf
));
641 if (!(o
->flags
& WANTED
)) {
645 add_object_array(o
, NULL
, &want_obj
);
650 * We have sent all our refs already, and the other end
651 * should have chosen out of them. When we are operating
652 * in the stateless RPC mode, however, their choice may
653 * have been based on the set of older refs advertised
654 * by another process that handled the initial request.
659 if (!use_sideband
&& daemon_mode
)
662 if (depth
== 0 && shallows
.nr
== 0)
665 struct commit_list
*result
= NULL
, *backup
= NULL
;
667 if (depth
== INFINITE_DEPTH
)
668 for (i
= 0; i
< shallows
.nr
; i
++) {
669 struct object
*object
= shallows
.objects
[i
].item
;
670 object
->flags
|= NOT_SHALLOW
;
674 get_shallow_commits(&want_obj
, depth
,
675 SHALLOW
, NOT_SHALLOW
);
677 struct object
*object
= &result
->item
->object
;
678 if (!(object
->flags
& (CLIENT_SHALLOW
|NOT_SHALLOW
))) {
679 packet_write(1, "shallow %s",
680 sha1_to_hex(object
->sha1
));
681 register_shallow(object
->sha1
);
684 result
= result
->next
;
686 free_commit_list(backup
);
687 for (i
= 0; i
< shallows
.nr
; i
++) {
688 struct object
*object
= shallows
.objects
[i
].item
;
689 if (object
->flags
& NOT_SHALLOW
) {
690 struct commit_list
*parents
;
691 packet_write(1, "unshallow %s",
692 sha1_to_hex(object
->sha1
));
693 object
->flags
&= ~CLIENT_SHALLOW
;
694 /* make sure the real parents are parsed */
695 unregister_shallow(object
->sha1
);
697 if (parse_commit((struct commit
*)object
))
698 die("invalid commit");
699 parents
= ((struct commit
*)object
)->parents
;
701 add_object_array(&parents
->item
->object
,
703 parents
= parents
->next
;
705 add_object_array(object
, NULL
, &extra_edge_obj
);
707 /* make sure commit traversal conforms to client */
708 register_shallow(object
->sha1
);
712 if (shallows
.nr
> 0) {
714 for (i
= 0; i
< shallows
.nr
; i
++)
715 register_shallow(shallows
.objects
[i
].item
->sha1
);
718 shallow_nr
+= shallows
.nr
;
719 free(shallows
.objects
);
722 /* return non-zero if the ref is hidden, otherwise 0 */
723 static int mark_our_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
725 struct object
*o
= lookup_unknown_object(sha1
);
727 if (ref_is_hidden(refname
)) {
728 o
->flags
|= HIDDEN_REF
;
732 die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1
));
737 static void format_symref_info(struct strbuf
*buf
, struct string_list
*symref
)
739 struct string_list_item
*item
;
743 for_each_string_list_item(item
, symref
)
744 strbuf_addf(buf
, " symref=%s:%s", item
->string
, (char *)item
->util
);
747 static int send_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
749 static const char *capabilities
= "multi_ack thin-pack side-band"
750 " side-band-64k ofs-delta shallow no-progress"
751 " include-tag multi_ack_detailed";
752 const char *refname_nons
= strip_namespace(refname
);
753 unsigned char peeled
[20];
755 if (mark_our_ref(refname
, sha1
, flag
, NULL
))
759 struct strbuf symref_info
= STRBUF_INIT
;
761 format_symref_info(&symref_info
, cb_data
);
762 packet_write(1, "%s %s%c%s%s%s%s agent=%s\n",
763 sha1_to_hex(sha1
), refname_nons
,
765 allow_tip_sha1_in_want
? " allow-tip-sha1-in-want" : "",
766 stateless_rpc
? " no-done" : "",
768 git_user_agent_sanitized());
769 strbuf_release(&symref_info
);
771 packet_write(1, "%s %s\n", sha1_to_hex(sha1
), refname_nons
);
774 if (!peel_ref(refname
, peeled
))
775 packet_write(1, "%s %s^{}\n", sha1_to_hex(peeled
), refname_nons
);
779 static int find_symref(const char *refname
, const unsigned char *sha1
, int flag
,
782 const char *symref_target
;
783 struct string_list_item
*item
;
784 unsigned char unused
[20];
786 if ((flag
& REF_ISSYMREF
) == 0)
788 symref_target
= resolve_ref_unsafe(refname
, unused
, 0, &flag
);
789 if (!symref_target
|| (flag
& REF_ISSYMREF
) == 0)
790 die("'%s' is a symref but it is not?", refname
);
791 item
= string_list_append(cb_data
, refname
);
792 item
->util
= xstrdup(symref_target
);
796 static void upload_pack(void)
798 struct string_list symref
= STRING_LIST_INIT_DUP
;
800 head_ref_namespaced(find_symref
, &symref
);
801 for_each_namespaced_ref(find_symref
, &symref
);
803 if (advertise_refs
|| !stateless_rpc
) {
805 head_ref_namespaced(send_ref
, &symref
);
806 for_each_namespaced_ref(send_ref
, &symref
);
809 head_ref_namespaced(mark_our_ref
, NULL
);
810 for_each_namespaced_ref(mark_our_ref
, NULL
);
812 string_list_clear(&symref
, 1);
818 get_common_commits();
823 static int upload_pack_config(const char *var
, const char *value
, void *unused
)
825 if (!strcmp("uploadpack.allowtipsha1inwant", var
))
826 allow_tip_sha1_in_want
= git_config_bool(var
, value
);
827 return parse_hide_refs_config(var
, value
, "uploadpack");
830 int main(int argc
, char **argv
)
838 packet_trace_identity("upload-pack");
839 git_extract_argv0_path(argv
[0]);
840 read_replace_refs
= 0;
842 for (i
= 1; i
< argc
; i
++) {
847 if (!strcmp(arg
, "--advertise-refs")) {
851 if (!strcmp(arg
, "--stateless-rpc")) {
855 if (!strcmp(arg
, "--strict")) {
859 if (!prefixcmp(arg
, "--timeout=")) {
860 timeout
= atoi(arg
+10);
864 if (!strcmp(arg
, "--")) {
871 usage(upload_pack_usage
);
877 if (!enter_repo(dir
, strict
))
878 die("'%s' does not appear to be a git repository", dir
);
879 if (is_repository_shallow())
880 die("attempt to fetch/clone from a shallow repository");
881 git_config(upload_pack_config
, NULL
);