11 #include "list-objects.h"
12 #include "list-objects-filter.h"
13 #include "list-objects-filter-options.h"
14 #include "run-command.h"
18 #include "string-list.h"
19 #include "argv-array.h"
20 #include "prio-queue.h"
23 #include "upload-pack.h"
26 /* Remember to update object flag allocation in object.h */
27 #define THEY_HAVE (1u << 11)
28 #define OUR_REF (1u << 12)
29 #define WANTED (1u << 13)
30 #define COMMON_KNOWN (1u << 14)
31 #define REACHABLE (1u << 15)
33 #define SHALLOW (1u << 16)
34 #define NOT_SHALLOW (1u << 17)
35 #define CLIENT_SHALLOW (1u << 18)
36 #define HIDDEN_REF (1u << 19)
38 static timestamp_t oldest_have
;
40 static int deepen_relative
;
43 static int use_thin_pack
, use_ofs_delta
, use_include_tag
;
44 static int no_progress
, daemon_mode
;
45 /* Allow specifying sha1 if it is a ref tip. */
46 #define ALLOW_TIP_SHA1 01
47 /* Allow request of a sha1 if it is reachable from a ref (possibly hidden ref). */
48 #define ALLOW_REACHABLE_SHA1 02
49 /* Allow request of any sha1. Implies ALLOW_TIP_SHA1 and ALLOW_REACHABLE_SHA1. */
50 #define ALLOW_ANY_SHA1 07
51 static unsigned int allow_unadvertised_object_request
;
52 static int shallow_nr
;
53 static struct object_array have_obj
;
54 static struct object_array want_obj
;
55 static struct object_array extra_edge_obj
;
56 static unsigned int timeout
;
57 static int keepalive
= 5;
59 * otherwise maximum packet size (up to 65520 bytes).
61 static int use_sideband
;
62 static int stateless_rpc
;
63 static const char *pack_objects_hook
;
65 static int filter_capability_requested
;
66 static int allow_filter
;
67 static struct list_objects_filter_options filter_options
;
69 static void reset_timeout(void)
74 static void send_client_data(int fd
, const char *data
, ssize_t sz
)
77 send_sideband(1, fd
, data
, sz
, use_sideband
);
84 /* XXX: are we happy to lose stuff here? */
88 write_or_die(fd
, data
, sz
);
91 static int write_one_shallow(const struct commit_graft
*graft
, void *cb_data
)
94 if (graft
->nr_parent
== -1)
95 fprintf(fp
, "--shallow %s\n", oid_to_hex(&graft
->oid
));
99 static void create_pack_file(void)
101 struct child_process pack_objects
= CHILD_PROCESS_INIT
;
102 char data
[8193], progress
[128];
103 char abort_msg
[] = "aborting due to possible repository "
104 "corruption on the remote side.";
110 if (!pack_objects_hook
)
111 pack_objects
.git_cmd
= 1;
113 argv_array_push(&pack_objects
.args
, pack_objects_hook
);
114 argv_array_push(&pack_objects
.args
, "git");
115 pack_objects
.use_shell
= 1;
119 argv_array_push(&pack_objects
.args
, "--shallow-file");
120 argv_array_push(&pack_objects
.args
, "");
122 argv_array_push(&pack_objects
.args
, "pack-objects");
123 argv_array_push(&pack_objects
.args
, "--revs");
125 argv_array_push(&pack_objects
.args
, "--thin");
127 argv_array_push(&pack_objects
.args
, "--stdout");
129 argv_array_push(&pack_objects
.args
, "--shallow");
131 argv_array_push(&pack_objects
.args
, "--progress");
133 argv_array_push(&pack_objects
.args
, "--delta-base-offset");
135 argv_array_push(&pack_objects
.args
, "--include-tag");
136 if (filter_options
.filter_spec
) {
137 if (pack_objects
.use_shell
) {
138 struct strbuf buf
= STRBUF_INIT
;
139 sq_quote_buf(&buf
, filter_options
.filter_spec
);
140 argv_array_pushf(&pack_objects
.args
, "--filter=%s", buf
.buf
);
141 strbuf_release(&buf
);
143 argv_array_pushf(&pack_objects
.args
, "--filter=%s",
144 filter_options
.filter_spec
);
148 pack_objects
.in
= -1;
149 pack_objects
.out
= -1;
150 pack_objects
.err
= -1;
152 if (start_command(&pack_objects
))
153 die("git upload-pack: unable to fork git-pack-objects");
155 pipe_fd
= xfdopen(pack_objects
.in
, "w");
158 for_each_commit_graft(write_one_shallow
, pipe_fd
);
160 for (i
= 0; i
< want_obj
.nr
; i
++)
161 fprintf(pipe_fd
, "%s\n",
162 oid_to_hex(&want_obj
.objects
[i
].item
->oid
));
163 fprintf(pipe_fd
, "--not\n");
164 for (i
= 0; i
< have_obj
.nr
; i
++)
165 fprintf(pipe_fd
, "%s\n",
166 oid_to_hex(&have_obj
.objects
[i
].item
->oid
));
167 for (i
= 0; i
< extra_edge_obj
.nr
; i
++)
168 fprintf(pipe_fd
, "%s\n",
169 oid_to_hex(&extra_edge_obj
.objects
[i
].item
->oid
));
170 fprintf(pipe_fd
, "\n");
174 /* We read from pack_objects.err to capture stderr output for
175 * progress bar, and pack_objects.out to capture the pack data.
179 struct pollfd pfd
[2];
180 int pe
, pu
, pollsize
;
188 if (0 <= pack_objects
.out
) {
189 pfd
[pollsize
].fd
= pack_objects
.out
;
190 pfd
[pollsize
].events
= POLLIN
;
194 if (0 <= pack_objects
.err
) {
195 pfd
[pollsize
].fd
= pack_objects
.err
;
196 pfd
[pollsize
].events
= POLLIN
;
204 ret
= poll(pfd
, pollsize
,
205 keepalive
< 0 ? -1 : 1000 * keepalive
);
208 if (errno
!= EINTR
) {
209 error_errno("poll failed, resuming");
214 if (0 <= pe
&& (pfd
[pe
].revents
& (POLLIN
|POLLHUP
))) {
215 /* Status ready; we ship that in the side-band
216 * or dump to the standard error.
218 sz
= xread(pack_objects
.err
, progress
,
221 send_client_data(2, progress
, sz
);
223 close(pack_objects
.err
);
224 pack_objects
.err
= -1;
228 /* give priority to status messages */
231 if (0 <= pu
&& (pfd
[pu
].revents
& (POLLIN
|POLLHUP
))) {
232 /* Data ready; we keep the last byte to ourselves
233 * in case we detect broken rev-list, so that we
234 * can leave the stream corrupted. This is
235 * unfortunate -- unpack-objects would happily
236 * accept a valid packdata with trailing garbage,
237 * so appending garbage after we pass all the
238 * pack data is not good enough to signal
239 * breakage to downstream.
247 sz
= xread(pack_objects
.out
, cp
,
248 sizeof(data
) - outsz
);
252 close(pack_objects
.out
);
253 pack_objects
.out
= -1;
259 buffered
= data
[sz
-1] & 0xFF;
264 send_client_data(1, data
, sz
);
268 * We hit the keepalive timeout without saying anything; send
269 * an empty message on the data sideband just to let the other
270 * side know we're still working on it, but don't have any data
273 * If we don't have a sideband channel, there's no room in the
274 * protocol to say anything, so those clients are just out of
277 if (!ret
&& use_sideband
) {
278 static const char buf
[] = "0005\1";
279 write_or_die(1, buf
, 5);
283 if (finish_command(&pack_objects
)) {
284 error("git upload-pack: git-pack-objects died with error.");
291 send_client_data(1, data
, 1);
292 fprintf(stderr
, "flushed.\n");
299 send_client_data(3, abort_msg
, sizeof(abort_msg
));
300 die("git upload-pack: %s", abort_msg
);
303 static int got_oid(const char *hex
, struct object_id
*oid
)
306 int we_knew_they_have
= 0;
308 if (get_oid_hex(hex
, oid
))
309 die("git upload-pack: expected SHA1 object, got '%s'", hex
);
310 if (!has_object_file(oid
))
313 o
= parse_object(oid
);
315 die("oops (%s)", oid_to_hex(oid
));
316 if (o
->type
== OBJ_COMMIT
) {
317 struct commit_list
*parents
;
318 struct commit
*commit
= (struct commit
*)o
;
319 if (o
->flags
& THEY_HAVE
)
320 we_knew_they_have
= 1;
322 o
->flags
|= THEY_HAVE
;
323 if (!oldest_have
|| (commit
->date
< oldest_have
))
324 oldest_have
= commit
->date
;
325 for (parents
= commit
->parents
;
327 parents
= parents
->next
)
328 parents
->item
->object
.flags
|= THEY_HAVE
;
330 if (!we_knew_they_have
) {
331 add_object_array(o
, NULL
, &have_obj
);
337 static int reachable(struct commit
*want
)
339 struct prio_queue work
= { compare_commits_by_commit_date
};
341 prio_queue_put(&work
, want
);
343 struct commit_list
*list
;
344 struct commit
*commit
= prio_queue_get(&work
);
346 if (commit
->object
.flags
& THEY_HAVE
) {
347 want
->object
.flags
|= COMMON_KNOWN
;
350 if (!commit
->object
.parsed
)
351 parse_object(&commit
->object
.oid
);
352 if (commit
->object
.flags
& REACHABLE
)
354 commit
->object
.flags
|= REACHABLE
;
355 if (commit
->date
< oldest_have
)
357 for (list
= commit
->parents
; list
; list
= list
->next
) {
358 struct commit
*parent
= list
->item
;
359 if (!(parent
->object
.flags
& REACHABLE
))
360 prio_queue_put(&work
, parent
);
363 want
->object
.flags
|= REACHABLE
;
364 clear_commit_marks(want
, REACHABLE
);
365 clear_prio_queue(&work
);
366 return (want
->object
.flags
& COMMON_KNOWN
);
369 static int ok_to_give_up(void)
376 for (i
= 0; i
< want_obj
.nr
; i
++) {
377 struct object
*want
= want_obj
.objects
[i
].item
;
379 if (want
->flags
& COMMON_KNOWN
)
381 want
= deref_tag(want
, "a want line", 0);
382 if (!want
|| want
->type
!= OBJ_COMMIT
) {
383 /* no way to tell if this is reachable by
384 * looking at the ancestry chain alone, so
385 * leave a note to ourselves not to worry about
386 * this object anymore.
388 want_obj
.objects
[i
].item
->flags
|= COMMON_KNOWN
;
391 if (!reachable((struct commit
*)want
))
397 static int get_common_commits(void)
399 struct object_id oid
;
400 char last_hex
[GIT_MAX_HEXSZ
+ 1];
405 save_commit_buffer
= 0;
408 char *line
= packet_read_line(0, NULL
);
414 if (multi_ack
== 2 && got_common
415 && !got_other
&& ok_to_give_up()) {
417 packet_write_fmt(1, "ACK %s ready\n", last_hex
);
419 if (have_obj
.nr
== 0 || multi_ack
)
420 packet_write_fmt(1, "NAK\n");
422 if (no_done
&& sent_ready
) {
423 packet_write_fmt(1, "ACK %s\n", last_hex
);
432 if (skip_prefix(line
, "have ", &arg
)) {
433 switch (got_oid(arg
, &oid
)) {
434 case -1: /* they have what we do not */
436 if (multi_ack
&& ok_to_give_up()) {
437 const char *hex
= oid_to_hex(&oid
);
438 if (multi_ack
== 2) {
440 packet_write_fmt(1, "ACK %s ready\n", hex
);
442 packet_write_fmt(1, "ACK %s continue\n", hex
);
447 oid_to_hex_r(last_hex
, &oid
);
449 packet_write_fmt(1, "ACK %s common\n", last_hex
);
451 packet_write_fmt(1, "ACK %s continue\n", last_hex
);
452 else if (have_obj
.nr
== 1)
453 packet_write_fmt(1, "ACK %s\n", last_hex
);
458 if (!strcmp(line
, "done")) {
459 if (have_obj
.nr
> 0) {
461 packet_write_fmt(1, "ACK %s\n", last_hex
);
464 packet_write_fmt(1, "NAK\n");
467 die("git upload-pack: expected SHA1 list, got '%s'", line
);
471 static int is_our_ref(struct object
*o
)
473 int allow_hidden_ref
= (allow_unadvertised_object_request
&
474 (ALLOW_TIP_SHA1
| ALLOW_REACHABLE_SHA1
));
475 return o
->flags
& ((allow_hidden_ref
? HIDDEN_REF
: 0) | OUR_REF
);
479 * on successful case, it's up to the caller to close cmd->out
481 static int do_reachable_revlist(struct child_process
*cmd
,
482 struct object_array
*src
,
483 struct object_array
*reachable
)
485 static const char *argv
[] = {
486 "rev-list", "--stdin", NULL
,
489 char namebuf
[GIT_MAX_HEXSZ
+ 2]; /* ^ + hash + LF */
499 * If the next rev-list --stdin encounters an unknown commit,
500 * it terminates, which will cause SIGPIPE in the write loop
503 sigchain_push(SIGPIPE
, SIG_IGN
);
505 if (start_command(cmd
))
509 namebuf
[GIT_SHA1_HEXSZ
+ 1] = '\n';
510 for (i
= get_max_object_index(); 0 < i
; ) {
511 o
= get_indexed_object(--i
);
514 if (reachable
&& o
->type
== OBJ_COMMIT
)
515 o
->flags
&= ~TMP_MARK
;
518 memcpy(namebuf
+ 1, oid_to_hex(&o
->oid
), GIT_SHA1_HEXSZ
);
519 if (write_in_full(cmd
->in
, namebuf
, GIT_SHA1_HEXSZ
+ 2) < 0)
522 namebuf
[GIT_SHA1_HEXSZ
] = '\n';
523 for (i
= 0; i
< src
->nr
; i
++) {
524 o
= src
->objects
[i
].item
;
527 add_object_array(o
, NULL
, reachable
);
530 if (reachable
&& o
->type
== OBJ_COMMIT
)
531 o
->flags
|= TMP_MARK
;
532 memcpy(namebuf
, oid_to_hex(&o
->oid
), GIT_SHA1_HEXSZ
);
533 if (write_in_full(cmd
->in
, namebuf
, GIT_SHA1_HEXSZ
+ 1) < 0)
538 sigchain_pop(SIGPIPE
);
543 sigchain_pop(SIGPIPE
);
552 static int get_reachable_list(struct object_array
*src
,
553 struct object_array
*reachable
)
555 struct child_process cmd
= CHILD_PROCESS_INIT
;
558 char namebuf
[GIT_MAX_HEXSZ
+ 2]; /* ^ + hash + LF */
559 const unsigned hexsz
= the_hash_algo
->hexsz
;
561 if (do_reachable_revlist(&cmd
, src
, reachable
) < 0)
564 while ((i
= read_in_full(cmd
.out
, namebuf
, hexsz
+ 1)) == hexsz
+ 1) {
565 struct object_id sha1
;
568 if (parse_oid_hex(namebuf
, &sha1
, &p
) || *p
!= '\n')
571 o
= lookup_object(sha1
.hash
);
572 if (o
&& o
->type
== OBJ_COMMIT
) {
573 o
->flags
&= ~TMP_MARK
;
576 for (i
= get_max_object_index(); 0 < i
; i
--) {
577 o
= get_indexed_object(i
- 1);
578 if (o
&& o
->type
== OBJ_COMMIT
&&
579 (o
->flags
& TMP_MARK
)) {
580 add_object_array(o
, NULL
, reachable
);
581 o
->flags
&= ~TMP_MARK
;
586 if (finish_command(&cmd
))
592 static int has_unreachable(struct object_array
*src
)
594 struct child_process cmd
= CHILD_PROCESS_INIT
;
598 if (do_reachable_revlist(&cmd
, src
, NULL
) < 0)
602 * The commits out of the rev-list are not ancestors of
605 i
= read_in_full(cmd
.out
, buf
, 1);
612 * rev-list may have died by encountering a bad commit
613 * in the history, in which case we do want to bail out
614 * even when it showed no commit.
616 if (finish_command(&cmd
))
619 /* All the non-tip ones are ancestors of what we advertised */
623 sigchain_pop(SIGPIPE
);
629 static void check_non_tip(void)
634 * In the normal in-process case without
635 * uploadpack.allowReachableSHA1InWant,
636 * non-tip requests can never happen.
638 if (!stateless_rpc
&& !(allow_unadvertised_object_request
& ALLOW_REACHABLE_SHA1
))
640 if (!has_unreachable(&want_obj
))
641 /* All the non-tip ones are ancestors of what we advertised */
645 /* Pick one of them (we know there at least is one) */
646 for (i
= 0; i
< want_obj
.nr
; i
++) {
647 struct object
*o
= want_obj
.objects
[i
].item
;
649 die("git upload-pack: not our ref %s",
650 oid_to_hex(&o
->oid
));
654 static void send_shallow(struct commit_list
*result
)
657 struct object
*object
= &result
->item
->object
;
658 if (!(object
->flags
& (CLIENT_SHALLOW
|NOT_SHALLOW
))) {
659 packet_write_fmt(1, "shallow %s",
660 oid_to_hex(&object
->oid
));
661 register_shallow(&object
->oid
);
664 result
= result
->next
;
668 static void send_unshallow(const struct object_array
*shallows
)
672 for (i
= 0; i
< shallows
->nr
; i
++) {
673 struct object
*object
= shallows
->objects
[i
].item
;
674 if (object
->flags
& NOT_SHALLOW
) {
675 struct commit_list
*parents
;
676 packet_write_fmt(1, "unshallow %s",
677 oid_to_hex(&object
->oid
));
678 object
->flags
&= ~CLIENT_SHALLOW
;
680 * We want to _register_ "object" as shallow, but we
681 * also need to traverse object's parents to deepen a
682 * shallow clone. Unregister it for now so we can
683 * parse and add the parents to the want list, then
686 unregister_shallow(&object
->oid
);
688 parse_commit_or_die((struct commit
*)object
);
689 parents
= ((struct commit
*)object
)->parents
;
691 add_object_array(&parents
->item
->object
,
693 parents
= parents
->next
;
695 add_object_array(object
, NULL
, &extra_edge_obj
);
697 /* make sure commit traversal conforms to client */
698 register_shallow(&object
->oid
);
702 static void deepen(int depth
, int deepen_relative
,
703 struct object_array
*shallows
)
705 if (depth
== INFINITE_DEPTH
&& !is_repository_shallow()) {
708 for (i
= 0; i
< shallows
->nr
; i
++) {
709 struct object
*object
= shallows
->objects
[i
].item
;
710 object
->flags
|= NOT_SHALLOW
;
712 } else if (deepen_relative
) {
713 struct object_array reachable_shallows
= OBJECT_ARRAY_INIT
;
714 struct commit_list
*result
;
716 get_reachable_list(shallows
, &reachable_shallows
);
717 result
= get_shallow_commits(&reachable_shallows
,
719 SHALLOW
, NOT_SHALLOW
);
720 send_shallow(result
);
721 free_commit_list(result
);
722 object_array_clear(&reachable_shallows
);
724 struct commit_list
*result
;
726 result
= get_shallow_commits(&want_obj
, depth
,
727 SHALLOW
, NOT_SHALLOW
);
728 send_shallow(result
);
729 free_commit_list(result
);
732 send_unshallow(shallows
);
735 static void deepen_by_rev_list(int ac
, const char **av
,
736 struct object_array
*shallows
)
738 struct commit_list
*result
;
740 result
= get_shallow_commits_by_rev_list(ac
, av
, SHALLOW
, NOT_SHALLOW
);
741 send_shallow(result
);
742 free_commit_list(result
);
743 send_unshallow(shallows
);
746 /* Returns 1 if a shallow list is sent or 0 otherwise */
747 static int send_shallow_list(int depth
, int deepen_rev_list
,
748 timestamp_t deepen_since
,
749 struct string_list
*deepen_not
,
750 struct object_array
*shallows
)
754 if (depth
> 0 && deepen_rev_list
)
755 die("git upload-pack: deepen and deepen-since (or deepen-not) cannot be used together");
757 deepen(depth
, deepen_relative
, shallows
);
759 } else if (deepen_rev_list
) {
760 struct argv_array av
= ARGV_ARRAY_INIT
;
763 argv_array_push(&av
, "rev-list");
765 argv_array_pushf(&av
, "--max-age=%"PRItime
, deepen_since
);
766 if (deepen_not
->nr
) {
767 argv_array_push(&av
, "--not");
768 for (i
= 0; i
< deepen_not
->nr
; i
++) {
769 struct string_list_item
*s
= deepen_not
->items
+ i
;
770 argv_array_push(&av
, s
->string
);
772 argv_array_push(&av
, "--not");
774 for (i
= 0; i
< want_obj
.nr
; i
++) {
775 struct object
*o
= want_obj
.objects
[i
].item
;
776 argv_array_push(&av
, oid_to_hex(&o
->oid
));
778 deepen_by_rev_list(av
.argc
, av
.argv
, shallows
);
779 argv_array_clear(&av
);
782 if (shallows
->nr
> 0) {
784 for (i
= 0; i
< shallows
->nr
; i
++)
785 register_shallow(&shallows
->objects
[i
].item
->oid
);
789 shallow_nr
+= shallows
->nr
;
793 static int process_shallow(const char *line
, struct object_array
*shallows
)
796 if (skip_prefix(line
, "shallow ", &arg
)) {
797 struct object_id oid
;
798 struct object
*object
;
799 if (get_oid_hex(arg
, &oid
))
800 die("invalid shallow line: %s", line
);
801 object
= parse_object(&oid
);
804 if (object
->type
!= OBJ_COMMIT
)
805 die("invalid shallow object %s", oid_to_hex(&oid
));
806 if (!(object
->flags
& CLIENT_SHALLOW
)) {
807 object
->flags
|= CLIENT_SHALLOW
;
808 add_object_array(object
, NULL
, shallows
);
816 static int process_deepen(const char *line
, int *depth
)
819 if (skip_prefix(line
, "deepen ", &arg
)) {
821 *depth
= (int)strtol(arg
, &end
, 0);
822 if (!end
|| *end
|| *depth
<= 0)
823 die("Invalid deepen: %s", line
);
830 static int process_deepen_since(const char *line
, timestamp_t
*deepen_since
, int *deepen_rev_list
)
833 if (skip_prefix(line
, "deepen-since ", &arg
)) {
835 *deepen_since
= parse_timestamp(arg
, &end
, 0);
836 if (!end
|| *end
|| !deepen_since
||
837 /* revisions.c's max_age -1 is special */
839 die("Invalid deepen-since: %s", line
);
840 *deepen_rev_list
= 1;
846 static int process_deepen_not(const char *line
, struct string_list
*deepen_not
, int *deepen_rev_list
)
849 if (skip_prefix(line
, "deepen-not ", &arg
)) {
851 struct object_id oid
;
852 if (expand_ref(arg
, strlen(arg
), &oid
, &ref
) != 1)
853 die("git upload-pack: ambiguous deepen-not: %s", line
);
854 string_list_append(deepen_not
, ref
);
856 *deepen_rev_list
= 1;
862 static void receive_needs(void)
864 struct object_array shallows
= OBJECT_ARRAY_INIT
;
865 struct string_list deepen_not
= STRING_LIST_INIT_DUP
;
868 timestamp_t deepen_since
= 0;
869 int deepen_rev_list
= 0;
874 const char *features
;
875 struct object_id oid_buf
;
876 char *line
= packet_read_line(0, NULL
);
883 if (process_shallow(line
, &shallows
))
885 if (process_deepen(line
, &depth
))
887 if (process_deepen_since(line
, &deepen_since
, &deepen_rev_list
))
889 if (process_deepen_not(line
, &deepen_not
, &deepen_rev_list
))
892 if (skip_prefix(line
, "filter ", &arg
)) {
893 if (!filter_capability_requested
)
894 die("git upload-pack: filtering capability not negotiated");
895 parse_list_objects_filter(&filter_options
, arg
);
899 if (!skip_prefix(line
, "want ", &arg
) ||
900 parse_oid_hex(arg
, &oid_buf
, &features
))
901 die("git upload-pack: protocol error, "
902 "expected to get object ID, not '%s'", line
);
904 if (parse_feature_request(features
, "deepen-relative"))
906 if (parse_feature_request(features
, "multi_ack_detailed"))
908 else if (parse_feature_request(features
, "multi_ack"))
910 if (parse_feature_request(features
, "no-done"))
912 if (parse_feature_request(features
, "thin-pack"))
914 if (parse_feature_request(features
, "ofs-delta"))
916 if (parse_feature_request(features
, "side-band-64k"))
917 use_sideband
= LARGE_PACKET_MAX
;
918 else if (parse_feature_request(features
, "side-band"))
919 use_sideband
= DEFAULT_PACKET_MAX
;
920 if (parse_feature_request(features
, "no-progress"))
922 if (parse_feature_request(features
, "include-tag"))
924 if (allow_filter
&& parse_feature_request(features
, "filter"))
925 filter_capability_requested
= 1;
927 o
= parse_object(&oid_buf
);
930 "ERR upload-pack: not our ref %s",
931 oid_to_hex(&oid_buf
));
932 die("git upload-pack: not our ref %s",
933 oid_to_hex(&oid_buf
));
935 if (!(o
->flags
& WANTED
)) {
937 if (!((allow_unadvertised_object_request
& ALLOW_ANY_SHA1
) == ALLOW_ANY_SHA1
940 add_object_array(o
, NULL
, &want_obj
);
945 * We have sent all our refs already, and the other end
946 * should have chosen out of them. When we are operating
947 * in the stateless RPC mode, however, their choice may
948 * have been based on the set of older refs advertised
949 * by another process that handled the initial request.
954 if (!use_sideband
&& daemon_mode
)
957 if (depth
== 0 && !deepen_rev_list
&& shallows
.nr
== 0)
960 if (send_shallow_list(depth
, deepen_rev_list
, deepen_since
,
961 &deepen_not
, &shallows
))
963 object_array_clear(&shallows
);
966 /* return non-zero if the ref is hidden, otherwise 0 */
967 static int mark_our_ref(const char *refname
, const char *refname_full
,
968 const struct object_id
*oid
)
970 struct object
*o
= lookup_unknown_object(oid
->hash
);
972 if (ref_is_hidden(refname
, refname_full
)) {
973 o
->flags
|= HIDDEN_REF
;
980 static int check_ref(const char *refname_full
, const struct object_id
*oid
,
981 int flag
, void *cb_data
)
983 const char *refname
= strip_namespace(refname_full
);
985 mark_our_ref(refname
, refname_full
, oid
);
989 static void format_symref_info(struct strbuf
*buf
, struct string_list
*symref
)
991 struct string_list_item
*item
;
995 for_each_string_list_item(item
, symref
)
996 strbuf_addf(buf
, " symref=%s:%s", item
->string
, (char *)item
->util
);
999 static int send_ref(const char *refname
, const struct object_id
*oid
,
1000 int flag
, void *cb_data
)
1002 static const char *capabilities
= "multi_ack thin-pack side-band"
1003 " side-band-64k ofs-delta shallow deepen-since deepen-not"
1004 " deepen-relative no-progress include-tag multi_ack_detailed";
1005 const char *refname_nons
= strip_namespace(refname
);
1006 struct object_id peeled
;
1008 if (mark_our_ref(refname_nons
, refname
, oid
))
1012 struct strbuf symref_info
= STRBUF_INIT
;
1014 format_symref_info(&symref_info
, cb_data
);
1015 packet_write_fmt(1, "%s %s%c%s%s%s%s%s%s agent=%s\n",
1016 oid_to_hex(oid
), refname_nons
,
1018 (allow_unadvertised_object_request
& ALLOW_TIP_SHA1
) ?
1019 " allow-tip-sha1-in-want" : "",
1020 (allow_unadvertised_object_request
& ALLOW_REACHABLE_SHA1
) ?
1021 " allow-reachable-sha1-in-want" : "",
1022 stateless_rpc
? " no-done" : "",
1024 allow_filter
? " filter" : "",
1025 git_user_agent_sanitized());
1026 strbuf_release(&symref_info
);
1028 packet_write_fmt(1, "%s %s\n", oid_to_hex(oid
), refname_nons
);
1030 capabilities
= NULL
;
1031 if (!peel_ref(refname
, &peeled
))
1032 packet_write_fmt(1, "%s %s^{}\n", oid_to_hex(&peeled
), refname_nons
);
1036 static int find_symref(const char *refname
, const struct object_id
*oid
,
1037 int flag
, void *cb_data
)
1039 const char *symref_target
;
1040 struct string_list_item
*item
;
1042 if ((flag
& REF_ISSYMREF
) == 0)
1044 symref_target
= resolve_ref_unsafe(refname
, 0, NULL
, &flag
);
1045 if (!symref_target
|| (flag
& REF_ISSYMREF
) == 0)
1046 die("'%s' is a symref but it is not?", refname
);
1047 item
= string_list_append(cb_data
, refname
);
1048 item
->util
= xstrdup(symref_target
);
1052 static int upload_pack_config(const char *var
, const char *value
, void *unused
)
1054 if (!strcmp("uploadpack.allowtipsha1inwant", var
)) {
1055 if (git_config_bool(var
, value
))
1056 allow_unadvertised_object_request
|= ALLOW_TIP_SHA1
;
1058 allow_unadvertised_object_request
&= ~ALLOW_TIP_SHA1
;
1059 } else if (!strcmp("uploadpack.allowreachablesha1inwant", var
)) {
1060 if (git_config_bool(var
, value
))
1061 allow_unadvertised_object_request
|= ALLOW_REACHABLE_SHA1
;
1063 allow_unadvertised_object_request
&= ~ALLOW_REACHABLE_SHA1
;
1064 } else if (!strcmp("uploadpack.allowanysha1inwant", var
)) {
1065 if (git_config_bool(var
, value
))
1066 allow_unadvertised_object_request
|= ALLOW_ANY_SHA1
;
1068 allow_unadvertised_object_request
&= ~ALLOW_ANY_SHA1
;
1069 } else if (!strcmp("uploadpack.keepalive", var
)) {
1070 keepalive
= git_config_int(var
, value
);
1073 } else if (current_config_scope() != CONFIG_SCOPE_REPO
) {
1074 if (!strcmp("uploadpack.packobjectshook", var
))
1075 return git_config_string(&pack_objects_hook
, var
, value
);
1076 } else if (!strcmp("uploadpack.allowfilter", var
)) {
1077 allow_filter
= git_config_bool(var
, value
);
1079 return parse_hide_refs_config(var
, value
, "uploadpack");
1082 void upload_pack(struct upload_pack_options
*options
)
1084 struct string_list symref
= STRING_LIST_INIT_DUP
;
1086 stateless_rpc
= options
->stateless_rpc
;
1087 timeout
= options
->timeout
;
1088 daemon_mode
= options
->daemon_mode
;
1090 git_config(upload_pack_config
, NULL
);
1092 head_ref_namespaced(find_symref
, &symref
);
1094 if (options
->advertise_refs
|| !stateless_rpc
) {
1096 head_ref_namespaced(send_ref
, &symref
);
1097 for_each_namespaced_ref(send_ref
, &symref
);
1098 advertise_shallow_grafts(1);
1101 head_ref_namespaced(check_ref
, NULL
);
1102 for_each_namespaced_ref(check_ref
, NULL
);
1104 string_list_clear(&symref
, 1);
1105 if (options
->advertise_refs
)
1110 get_common_commits();
1115 struct upload_pack_data
{
1116 struct object_array wants
;
1117 struct oid_array haves
;
1119 struct object_array shallows
;
1120 struct string_list deepen_not
;
1122 timestamp_t deepen_since
;
1123 int deepen_rev_list
;
1124 int deepen_relative
;
1126 unsigned stateless_rpc
: 1;
1128 unsigned use_thin_pack
: 1;
1129 unsigned use_ofs_delta
: 1;
1130 unsigned no_progress
: 1;
1131 unsigned use_include_tag
: 1;
1135 static void upload_pack_data_init(struct upload_pack_data
*data
)
1137 struct object_array wants
= OBJECT_ARRAY_INIT
;
1138 struct oid_array haves
= OID_ARRAY_INIT
;
1139 struct object_array shallows
= OBJECT_ARRAY_INIT
;
1140 struct string_list deepen_not
= STRING_LIST_INIT_DUP
;
1142 memset(data
, 0, sizeof(*data
));
1143 data
->wants
= wants
;
1144 data
->haves
= haves
;
1145 data
->shallows
= shallows
;
1146 data
->deepen_not
= deepen_not
;
1149 static void upload_pack_data_clear(struct upload_pack_data
*data
)
1151 object_array_clear(&data
->wants
);
1152 oid_array_clear(&data
->haves
);
1153 object_array_clear(&data
->shallows
);
1154 string_list_clear(&data
->deepen_not
, 0);
1157 static int parse_want(const char *line
)
1160 if (skip_prefix(line
, "want ", &arg
)) {
1161 struct object_id oid
;
1164 if (get_oid_hex(arg
, &oid
))
1165 die("git upload-pack: protocol error, "
1166 "expected to get oid, not '%s'", line
);
1168 o
= parse_object(&oid
);
1171 "ERR upload-pack: not our ref %s",
1173 die("git upload-pack: not our ref %s",
1177 if (!(o
->flags
& WANTED
)) {
1179 add_object_array(o
, NULL
, &want_obj
);
1188 static int parse_have(const char *line
, struct oid_array
*haves
)
1191 if (skip_prefix(line
, "have ", &arg
)) {
1192 struct object_id oid
;
1194 if (get_oid_hex(arg
, &oid
))
1195 die("git upload-pack: expected SHA1 object, got '%s'", arg
);
1196 oid_array_append(haves
, &oid
);
1203 static void process_args(struct packet_reader
*request
,
1204 struct upload_pack_data
*data
)
1206 while (packet_reader_read(request
) != PACKET_READ_FLUSH
) {
1207 const char *arg
= request
->line
;
1211 if (parse_want(arg
))
1213 /* process have line */
1214 if (parse_have(arg
, &data
->haves
))
1217 /* process args like thin-pack */
1218 if (!strcmp(arg
, "thin-pack")) {
1222 if (!strcmp(arg
, "ofs-delta")) {
1226 if (!strcmp(arg
, "no-progress")) {
1230 if (!strcmp(arg
, "include-tag")) {
1231 use_include_tag
= 1;
1234 if (!strcmp(arg
, "done")) {
1239 /* Shallow related arguments */
1240 if (process_shallow(arg
, &data
->shallows
))
1242 if (process_deepen(arg
, &data
->depth
))
1244 if (process_deepen_since(arg
, &data
->deepen_since
,
1245 &data
->deepen_rev_list
))
1247 if (process_deepen_not(arg
, &data
->deepen_not
,
1248 &data
->deepen_rev_list
))
1250 if (!strcmp(arg
, "deepen-relative")) {
1251 data
->deepen_relative
= 1;
1255 if (allow_filter
&& skip_prefix(arg
, "filter ", &p
)) {
1256 parse_list_objects_filter(&filter_options
, p
);
1260 /* ignore unknown lines maybe? */
1261 die("unexpected line: '%s'", arg
);
1265 static int process_haves(struct oid_array
*haves
, struct oid_array
*common
)
1270 for (i
= 0; i
< haves
->nr
; i
++) {
1271 const struct object_id
*oid
= &haves
->oid
[i
];
1273 int we_knew_they_have
= 0;
1275 if (!has_object_file(oid
))
1278 oid_array_append(common
, oid
);
1280 o
= parse_object(oid
);
1282 die("oops (%s)", oid_to_hex(oid
));
1283 if (o
->type
== OBJ_COMMIT
) {
1284 struct commit_list
*parents
;
1285 struct commit
*commit
= (struct commit
*)o
;
1286 if (o
->flags
& THEY_HAVE
)
1287 we_knew_they_have
= 1;
1289 o
->flags
|= THEY_HAVE
;
1290 if (!oldest_have
|| (commit
->date
< oldest_have
))
1291 oldest_have
= commit
->date
;
1292 for (parents
= commit
->parents
;
1294 parents
= parents
->next
)
1295 parents
->item
->object
.flags
|= THEY_HAVE
;
1297 if (!we_knew_they_have
)
1298 add_object_array(o
, NULL
, &have_obj
);
1304 static int send_acks(struct oid_array
*acks
, struct strbuf
*response
)
1308 packet_buf_write(response
, "acknowledgments\n");
1312 packet_buf_write(response
, "NAK\n");
1314 for (i
= 0; i
< acks
->nr
; i
++) {
1315 packet_buf_write(response
, "ACK %s\n",
1316 oid_to_hex(&acks
->oid
[i
]));
1319 if (ok_to_give_up()) {
1321 packet_buf_write(response
, "ready\n");
1328 static int process_haves_and_send_acks(struct upload_pack_data
*data
)
1330 struct oid_array common
= OID_ARRAY_INIT
;
1331 struct strbuf response
= STRBUF_INIT
;
1334 process_haves(&data
->haves
, &common
);
1337 } else if (send_acks(&common
, &response
)) {
1338 packet_buf_delim(&response
);
1342 packet_buf_flush(&response
);
1347 write_or_die(1, response
.buf
, response
.len
);
1348 strbuf_release(&response
);
1350 oid_array_clear(&data
->haves
);
1351 oid_array_clear(&common
);
1355 static void send_shallow_info(struct upload_pack_data
*data
)
1357 /* No shallow info needs to be sent */
1358 if (!data
->depth
&& !data
->deepen_rev_list
&& !data
->shallows
.nr
&&
1359 !is_repository_shallow())
1362 packet_write_fmt(1, "shallow-info\n");
1364 if (!send_shallow_list(data
->depth
, data
->deepen_rev_list
,
1365 data
->deepen_since
, &data
->deepen_not
,
1366 &data
->shallows
) && is_repository_shallow())
1367 deepen(INFINITE_DEPTH
, data
->deepen_relative
, &data
->shallows
);
1373 FETCH_PROCESS_ARGS
= 0,
1379 int upload_pack_v2(struct repository
*r
, struct argv_array
*keys
,
1380 struct packet_reader
*request
)
1382 enum fetch_state state
= FETCH_PROCESS_ARGS
;
1383 struct upload_pack_data data
;
1385 git_config(upload_pack_config
, NULL
);
1387 upload_pack_data_init(&data
);
1388 use_sideband
= LARGE_PACKET_MAX
;
1390 while (state
!= FETCH_DONE
) {
1392 case FETCH_PROCESS_ARGS
:
1393 process_args(request
, &data
);
1397 * Request didn't contain any 'want' lines,
1398 * guess they didn't want anything.
1401 } else if (data
.haves
.nr
) {
1403 * Request had 'have' lines, so lets ACK them.
1405 state
= FETCH_SEND_ACKS
;
1408 * Request had 'want's but no 'have's so we can
1409 * immedietly go to construct and send a pack.
1411 state
= FETCH_SEND_PACK
;
1414 case FETCH_SEND_ACKS
:
1415 if (process_haves_and_send_acks(&data
))
1416 state
= FETCH_SEND_PACK
;
1420 case FETCH_SEND_PACK
:
1421 send_shallow_info(&data
);
1423 packet_write_fmt(1, "packfile\n");
1432 upload_pack_data_clear(&data
);
1436 int upload_pack_advertise(struct repository
*r
,
1437 struct strbuf
*value
)
1440 int allow_filter_value
;
1441 strbuf_addstr(value
, "shallow");
1442 if (!repo_config_get_bool(the_repository
,
1443 "uploadpack.allowfilter",
1444 &allow_filter_value
) &&
1446 strbuf_addstr(value
, " filter");