11 #include "list-objects.h"
13 static const char upload_pack_usage
[] = "git-upload-pack [--strict] [--timeout=nn] <dir>";
15 /* bits #0..7 in revision.h, #8..10 in commit.c */
16 #define THEY_HAVE (1u << 11)
17 #define OUR_REF (1u << 12)
18 #define WANTED (1u << 13)
19 #define COMMON_KNOWN (1u << 14)
20 #define REACHABLE (1u << 15)
22 #define SHALLOW (1u << 16)
23 #define NOT_SHALLOW (1u << 17)
24 #define CLIENT_SHALLOW (1u << 18)
26 static unsigned long oldest_have
;
28 static int multi_ack
, nr_our_refs
;
29 static int use_thin_pack
, use_ofs_delta
;
30 static struct object_array have_obj
;
31 static struct object_array want_obj
;
32 static unsigned int timeout
;
34 * otherwise maximum packet size (up to 65520 bytes).
36 static int use_sideband
;
38 static void reset_timeout(void)
43 static int strip(char *line
, int len
)
45 if (len
&& line
[len
-1] == '\n')
50 static ssize_t
send_client_data(int fd
, const char *data
, ssize_t sz
)
53 return send_sideband(1, fd
, data
, sz
, use_sideband
);
58 /* XXX: are we happy to lose stuff here? */
62 return safe_write(fd
, data
, sz
);
65 FILE *pack_pipe
= NULL
;
66 static void show_commit(struct commit
*commit
)
68 if (commit
->object
.flags
& BOUNDARY
)
69 fputc('-', pack_pipe
);
70 if (fputs(sha1_to_hex(commit
->object
.sha1
), pack_pipe
) < 0)
71 die("broken output pipe");
72 fputc('\n', pack_pipe
);
75 commit
->buffer
= NULL
;
78 static void show_object(struct object_array_entry
*p
)
80 /* An object with name "foo\n0000000..." can be used to
81 * confuse downstream git-pack-objects very badly.
83 const char *ep
= strchr(p
->name
, '\n');
85 fprintf(pack_pipe
, "%s %.*s\n", sha1_to_hex(p
->item
->sha1
),
90 fprintf(pack_pipe
, "%s %s\n",
91 sha1_to_hex(p
->item
->sha1
), p
->name
);
94 static void show_edge(struct commit
*commit
)
96 fprintf(pack_pipe
, "-%s\n", sha1_to_hex(commit
->object
.sha1
));
99 static void create_pack_file(void)
101 /* Pipes between rev-list to pack-objects, pack-objects to us
102 * and pack-objects error stream for progress bar.
104 int lp_pipe
[2], pu_pipe
[2], pe_pipe
[2];
105 pid_t pid_rev_list
, pid_pack_objects
;
106 int create_full_pack
= (nr_our_refs
== want_obj
.nr
&& !have_obj
.nr
);
107 char data
[8193], progress
[128];
108 char abort_msg
[] = "aborting due to possible repository "
109 "corruption on the remote side.";
112 if (pipe(lp_pipe
) < 0)
113 die("git-upload-pack: unable to create pipe");
114 pid_rev_list
= fork();
115 if (pid_rev_list
< 0)
116 die("git-upload-pack: unable to fork git-rev-list");
120 struct rev_info revs
;
123 pack_pipe
= fdopen(lp_pipe
[1], "w");
125 if (create_full_pack
)
126 use_thin_pack
= 0; /* no point doing it */
127 init_revisions(&revs
, NULL
);
128 revs
.tag_objects
= 1;
129 revs
.tree_objects
= 1;
130 revs
.blob_objects
= 1;
134 if (create_full_pack
) {
135 const char *args
[] = {"rev-list", "--all", NULL
};
136 setup_revisions(2, args
, &revs
, NULL
);
138 for (i
= 0; i
< want_obj
.nr
; i
++) {
139 struct object
*o
= want_obj
.objects
[i
].item
;
141 o
->flags
&= ~UNINTERESTING
;
142 add_pending_object(&revs
, o
, NULL
);
144 for (i
= 0; i
< have_obj
.nr
; i
++) {
145 struct object
*o
= have_obj
.objects
[i
].item
;
146 o
->flags
|= UNINTERESTING
;
147 add_pending_object(&revs
, o
, NULL
);
149 setup_revisions(0, NULL
, &revs
, NULL
);
151 prepare_revision_walk(&revs
);
152 mark_edges_uninteresting(revs
.commits
, &revs
, show_edge
);
153 traverse_commit_list(&revs
, show_commit
, show_object
);
157 if (pipe(pu_pipe
) < 0)
158 die("git-upload-pack: unable to create pipe");
159 if (pipe(pe_pipe
) < 0)
160 die("git-upload-pack: unable to create pipe");
161 pid_pack_objects
= fork();
162 if (pid_pack_objects
< 0) {
163 /* daemon sets things up to ignore TERM */
164 kill(pid_rev_list
, SIGKILL
);
165 die("git-upload-pack: unable to fork git-pack-objects");
167 if (!pid_pack_objects
) {
178 execl_git_cmd("pack-objects", "--stdout", "--progress",
179 use_ofs_delta
? "--delta-base-offset" : NULL
,
181 kill(pid_rev_list
, SIGKILL
);
182 die("git-upload-pack: unable to exec git-pack-objects");
188 /* We read from pe_pipe[0] to capture stderr output for
189 * progress bar, and pu_pipe[0] to capture the pack data.
196 struct pollfd pfd
[2];
200 int pe
, pu
, pollsize
;
207 if (0 <= pu_pipe
[0]) {
208 pfd
[pollsize
].fd
= pu_pipe
[0];
209 pfd
[pollsize
].events
= POLLIN
;
213 if (0 <= pe_pipe
[0]) {
214 pfd
[pollsize
].fd
= pe_pipe
[0];
215 pfd
[pollsize
].events
= POLLIN
;
221 if (poll(pfd
, pollsize
, -1) < 0) {
222 if (errno
!= EINTR
) {
223 error("poll failed, resuming: %s",
229 if (0 <= pu
&& (pfd
[pu
].revents
& (POLLIN
|POLLHUP
))) {
230 /* Data ready; we keep the last byte
231 * to ourselves in case we detect
232 * broken rev-list, so that we can
233 * leave the stream corrupted. This
234 * is unfortunate -- unpack-objects
235 * would happily accept a valid pack
236 * data with trailing garbage, so
237 * appending garbage after we pass all
238 * the pack data is not good enough to
239 * signal breakage to downstream.
247 sz
= xread(pu_pipe
[0], cp
,
248 sizeof(data
) - outsz
);
259 buffered
= data
[sz
-1] & 0xFF;
264 sz
= send_client_data(1, data
, sz
);
268 if (0 <= pe
&& (pfd
[pe
].revents
& (POLLIN
|POLLHUP
))) {
269 /* Status ready; we ship that in the side-band
270 * or dump to the standard error.
272 sz
= xread(pe_pipe
[0], progress
,
275 send_client_data(2, progress
, sz
);
285 /* See if the children are still there */
286 if (pid_rev_list
|| pid_pack_objects
) {
287 pid
= waitpid(-1, &status
, WNOHANG
);
290 who
= ((pid
== pid_rev_list
) ? "git-rev-list" :
291 (pid
== pid_pack_objects
) ? "git-pack-objects" :
295 error("git-upload-pack: %s",
299 error("git-upload-pack: we weren't "
300 "waiting for %d", pid
);
303 if (!WIFEXITED(status
) || WEXITSTATUS(status
) > 0) {
304 error("git-upload-pack: %s died with error.",
308 if (pid
== pid_rev_list
)
310 if (pid
== pid_pack_objects
)
311 pid_pack_objects
= 0;
312 if (pid_rev_list
|| pid_pack_objects
)
316 /* both died happily */
323 sz
= send_client_data(1, data
, 1);
326 fprintf(stderr
, "flushed.\n");
333 if (pid_pack_objects
)
334 kill(pid_pack_objects
, SIGKILL
);
336 kill(pid_rev_list
, SIGKILL
);
337 send_client_data(3, abort_msg
, sizeof(abort_msg
));
338 die("git-upload-pack: %s", abort_msg
);
341 static int got_sha1(char *hex
, unsigned char *sha1
)
344 int we_knew_they_have
= 0;
346 if (get_sha1_hex(hex
, sha1
))
347 die("git-upload-pack: expected SHA1 object, got '%s'", hex
);
348 if (!has_sha1_file(sha1
))
351 o
= lookup_object(sha1
);
352 if (!(o
&& o
->parsed
))
353 o
= parse_object(sha1
);
355 die("oops (%s)", sha1_to_hex(sha1
));
356 if (o
->type
== OBJ_COMMIT
) {
357 struct commit_list
*parents
;
358 struct commit
*commit
= (struct commit
*)o
;
359 if (o
->flags
& THEY_HAVE
)
360 we_knew_they_have
= 1;
362 o
->flags
|= THEY_HAVE
;
363 if (!oldest_have
|| (commit
->date
< oldest_have
))
364 oldest_have
= commit
->date
;
365 for (parents
= commit
->parents
;
367 parents
= parents
->next
)
368 parents
->item
->object
.flags
|= THEY_HAVE
;
370 if (!we_knew_they_have
) {
371 add_object_array(o
, NULL
, &have_obj
);
377 static int reachable(struct commit
*want
)
379 struct commit_list
*work
= NULL
;
381 insert_by_date(want
, &work
);
383 struct commit_list
*list
= work
->next
;
384 struct commit
*commit
= work
->item
;
388 if (commit
->object
.flags
& THEY_HAVE
) {
389 want
->object
.flags
|= COMMON_KNOWN
;
392 if (!commit
->object
.parsed
)
393 parse_object(commit
->object
.sha1
);
394 if (commit
->object
.flags
& REACHABLE
)
396 commit
->object
.flags
|= REACHABLE
;
397 if (commit
->date
< oldest_have
)
399 for (list
= commit
->parents
; list
; list
= list
->next
) {
400 struct commit
*parent
= list
->item
;
401 if (!(parent
->object
.flags
& REACHABLE
))
402 insert_by_date(parent
, &work
);
405 want
->object
.flags
|= REACHABLE
;
406 clear_commit_marks(want
, REACHABLE
);
407 free_commit_list(work
);
408 return (want
->object
.flags
& COMMON_KNOWN
);
411 static int ok_to_give_up(void)
418 for (i
= 0; i
< want_obj
.nr
; i
++) {
419 struct object
*want
= want_obj
.objects
[i
].item
;
421 if (want
->flags
& COMMON_KNOWN
)
423 want
= deref_tag(want
, "a want line", 0);
424 if (!want
|| want
->type
!= OBJ_COMMIT
) {
425 /* no way to tell if this is reachable by
426 * looking at the ancestry chain alone, so
427 * leave a note to ourselves not to worry about
428 * this object anymore.
430 want_obj
.objects
[i
].item
->flags
|= COMMON_KNOWN
;
433 if (!reachable((struct commit
*)want
))
439 static int get_common_commits(void)
441 static char line
[1000];
442 unsigned char sha1
[20];
443 char hex
[41], last_hex
[41];
446 track_object_refs
= 0;
447 save_commit_buffer
= 0;
450 len
= packet_read_line(0, line
, sizeof(line
));
454 if (have_obj
.nr
== 0 || multi_ack
)
455 packet_write(1, "NAK\n");
458 len
= strip(line
, len
);
459 if (!strncmp(line
, "have ", 5)) {
460 switch (got_sha1(line
+5, sha1
)) {
461 case -1: /* they have what we do not */
462 if (multi_ack
&& ok_to_give_up())
463 packet_write(1, "ACK %s continue\n",
467 memcpy(hex
, sha1_to_hex(sha1
), 41);
469 const char *msg
= "ACK %s continue\n";
470 packet_write(1, msg
, hex
);
471 memcpy(last_hex
, hex
, 41);
473 else if (have_obj
.nr
== 1)
474 packet_write(1, "ACK %s\n", 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 void receive_needs(void)
494 struct object_array shallows
= {0, 0, NULL
};
495 static char line
[1000];
500 unsigned char sha1_buf
[20];
501 len
= packet_read_line(0, line
, sizeof(line
));
506 if (!strncmp("shallow ", line
, 8)) {
507 unsigned char sha1
[20];
508 struct object
*object
;
510 if (get_sha1(line
+ 8, sha1
))
511 die("invalid shallow line: %s", line
);
512 object
= parse_object(sha1
);
514 die("did not find object for %s", line
);
515 object
->flags
|= CLIENT_SHALLOW
;
516 add_object_array(object
, NULL
, &shallows
);
519 if (!strncmp("deepen ", line
, 7)) {
522 depth
= strtol(line
+ 7, &end
, 0);
523 if (end
== line
+ 7 || depth
<= 0)
524 die("Invalid deepen: %s", line
);
527 if (strncmp("want ", line
, 5) ||
528 get_sha1_hex(line
+5, sha1_buf
))
529 die("git-upload-pack: protocol error, "
530 "expected to get sha, not '%s'", line
);
531 if (strstr(line
+45, "multi_ack"))
533 if (strstr(line
+45, "thin-pack"))
535 if (strstr(line
+45, "ofs-delta"))
537 if (strstr(line
+45, "side-band-64k"))
538 use_sideband
= LARGE_PACKET_MAX
;
539 else if (strstr(line
+45, "side-band"))
540 use_sideband
= DEFAULT_PACKET_MAX
;
542 /* We have sent all our refs already, and the other end
543 * should have chosen out of them; otherwise they are
544 * asking for nonsense.
546 * Hmph. We may later want to allow "want" line that
547 * asks for something like "master~10" (symbolic)...
548 * would it make sense? I don't know.
550 o
= lookup_object(sha1_buf
);
551 if (!o
|| !(o
->flags
& OUR_REF
))
552 die("git-upload-pack: not our ref %s", line
+5);
553 if (!(o
->flags
& WANTED
)) {
555 add_object_array(o
, NULL
, &want_obj
);
558 if (depth
== 0 && shallows
.nr
== 0)
561 struct commit_list
*result
, *backup
;
563 backup
= result
= get_shallow_commits(&want_obj
, depth
,
564 SHALLOW
, NOT_SHALLOW
);
566 struct object
*object
= &result
->item
->object
;
567 if (!(object
->flags
& (CLIENT_SHALLOW
|NOT_SHALLOW
))) {
568 packet_write(1, "shallow %s",
569 sha1_to_hex(object
->sha1
));
570 register_shallow(object
->sha1
);
572 result
= result
->next
;
574 free_commit_list(backup
);
575 for (i
= 0; i
< shallows
.nr
; i
++) {
576 struct object
*object
= shallows
.objects
[i
].item
;
577 if (object
->flags
& NOT_SHALLOW
) {
578 struct commit_list
*parents
;
579 packet_write(1, "unshallow %s",
580 sha1_to_hex(object
->sha1
));
581 object
->flags
&= ~CLIENT_SHALLOW
;
582 /* make sure the real parents are parsed */
583 unregister_shallow(object
->sha1
);
585 parse_commit((struct commit
*)object
);
586 parents
= ((struct commit
*)object
)->parents
;
588 add_object_array(&parents
->item
->object
,
590 parents
= parents
->next
;
593 /* make sure commit traversal conforms to client */
594 register_shallow(object
->sha1
);
598 if (shallows
.nr
> 0) {
600 for (i
= 0; i
< shallows
.nr
; i
++)
601 register_shallow(shallows
.objects
[i
].item
->sha1
);
603 free(shallows
.objects
);
606 static int send_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
608 static const char *capabilities
= "multi_ack thin-pack side-band"
609 " side-band-64k ofs-delta shallow";
610 struct object
*o
= parse_object(sha1
);
613 die("git-upload-pack: cannot find object %s:", sha1_to_hex(sha1
));
616 packet_write(1, "%s %s%c%s\n", sha1_to_hex(sha1
), refname
,
619 packet_write(1, "%s %s\n", sha1_to_hex(sha1
), refname
);
621 if (!(o
->flags
& OUR_REF
)) {
625 if (o
->type
== OBJ_TAG
) {
626 o
= deref_tag(o
, refname
, 0);
627 packet_write(1, "%s %s^{}\n", sha1_to_hex(o
->sha1
), refname
);
632 static void upload_pack(void)
635 head_ref(send_ref
, NULL
);
636 for_each_ref(send_ref
, NULL
);
640 get_common_commits();
645 int main(int argc
, char **argv
)
651 for (i
= 1; i
< argc
; i
++) {
656 if (!strcmp(arg
, "--strict")) {
660 if (!strncmp(arg
, "--timeout=", 10)) {
661 timeout
= atoi(arg
+10);
664 if (!strcmp(arg
, "--")) {
671 usage(upload_pack_usage
);
674 if (!enter_repo(dir
, strict
))
675 die("'%s': unable to chdir or not a git archive", dir
);
676 if (is_repository_shallow())
677 die("attempt to fetch/clone from a shallow repository");