1 #include "git-compat-util.h"
3 #include "repository.h"
6 #include "environment.h"
17 #include "fetch-pack.h"
19 #include "run-command.h"
22 #include "transport.h"
24 #include "oid-array.h"
27 #include "object-store.h"
28 #include "connected.h"
29 #include "fetch-negotiator.h"
32 #include "commit-reach.h"
33 #include "commit-graph.h"
35 #include "mergesort.h"
38 static int transfer_unpack_limit
= -1;
39 static int fetch_unpack_limit
= -1;
40 static int unpack_limit
= 100;
41 static int prefer_ofs_delta
= 1;
43 static int deepen_since_ok
;
44 static int deepen_not_ok
;
45 static int fetch_fsck_objects
= -1;
46 static int transfer_fsck_objects
= -1;
47 static int agent_supported
;
48 static int server_supports_filtering
;
49 static int advertise_sid
;
50 static struct shallow_lock shallow_lock
;
51 static const char *alternate_shallow_file
;
52 static struct fsck_options fsck_options
= FSCK_OPTIONS_MISSING_GITMODULES
;
53 static struct strbuf fsck_msg_types
= STRBUF_INIT
;
54 static struct string_list uri_protocols
= STRING_LIST_INIT_DUP
;
56 /* Remember to update object flag allocation in object.h */
57 #define COMPLETE (1U << 0)
58 #define ALTERNATE (1U << 1)
59 #define COMMON (1U << 6)
60 #define REACH_SCRATCH (1U << 7)
63 * After sending this many "have"s if we do not get any new ACK , we
64 * give up traversing our history.
66 #define MAX_IN_VAIN 256
68 static int multi_ack
, use_sideband
;
69 /* Allow specifying sha1 if it is a ref tip. */
70 #define ALLOW_TIP_SHA1 01
71 /* Allow request of a sha1 if it is reachable from a ref (possibly hidden ref). */
72 #define ALLOW_REACHABLE_SHA1 02
73 static unsigned int allow_unadvertised_object_request
;
75 __attribute__((format (printf
, 2, 3)))
76 static inline void print_verbose(const struct fetch_pack_args
*args
,
84 va_start(params
, fmt
);
85 vfprintf(stderr
, fmt
, params
);
90 struct alternate_object_cache
{
91 struct object
**items
;
95 static void cache_one_alternate(const struct object_id
*oid
,
98 struct alternate_object_cache
*cache
= vcache
;
99 struct object
*obj
= parse_object(the_repository
, oid
);
101 if (!obj
|| (obj
->flags
& ALTERNATE
))
104 obj
->flags
|= ALTERNATE
;
105 ALLOC_GROW(cache
->items
, cache
->nr
+ 1, cache
->alloc
);
106 cache
->items
[cache
->nr
++] = obj
;
109 static void for_each_cached_alternate(struct fetch_negotiator
*negotiator
,
110 void (*cb
)(struct fetch_negotiator
*,
113 static int initialized
;
114 static struct alternate_object_cache cache
;
118 for_each_alternate_ref(cache_one_alternate
, &cache
);
122 for (i
= 0; i
< cache
.nr
; i
++)
123 cb(negotiator
, cache
.items
[i
]);
126 static struct commit
*deref_without_lazy_fetch_extended(const struct object_id
*oid
,
127 int mark_tags_complete
,
128 enum object_type
*type
,
129 unsigned int oi_flags
)
131 struct object_info info
= { .typep
= type
};
132 struct commit
*commit
;
134 commit
= lookup_commit_in_graph(the_repository
, oid
);
139 if (oid_object_info_extended(the_repository
, oid
, &info
,
142 if (*type
== OBJ_TAG
) {
143 struct tag
*tag
= (struct tag
*)
144 parse_object(the_repository
, oid
);
148 if (mark_tags_complete
)
149 tag
->object
.flags
|= COMPLETE
;
150 oid
= &tag
->tagged
->oid
;
156 if (*type
== OBJ_COMMIT
) {
157 struct commit
*commit
= lookup_commit(the_repository
, oid
);
158 if (!commit
|| repo_parse_commit(the_repository
, commit
))
167 static struct commit
*deref_without_lazy_fetch(const struct object_id
*oid
,
168 int mark_tags_complete
)
170 enum object_type type
;
171 unsigned flags
= OBJECT_INFO_SKIP_FETCH_OBJECT
| OBJECT_INFO_QUICK
;
172 return deref_without_lazy_fetch_extended(oid
, mark_tags_complete
,
176 static int rev_list_insert_ref(struct fetch_negotiator
*negotiator
,
177 const struct object_id
*oid
)
179 struct commit
*c
= deref_without_lazy_fetch(oid
, 0);
182 negotiator
->add_tip(negotiator
, c
);
186 static int rev_list_insert_ref_oid(const char *refname UNUSED
,
187 const struct object_id
*oid
,
191 return rev_list_insert_ref(cb_data
, oid
);
202 static void consume_shallow_list(struct fetch_pack_args
*args
,
203 struct packet_reader
*reader
)
205 if (args
->stateless_rpc
&& args
->deepen
) {
206 /* If we sent a depth we will get back "duplicate"
207 * shallow and unshallow commands every time there
208 * is a block of have lines exchanged.
210 while (packet_reader_read(reader
) == PACKET_READ_NORMAL
) {
211 if (starts_with(reader
->line
, "shallow "))
213 if (starts_with(reader
->line
, "unshallow "))
215 die(_("git fetch-pack: expected shallow list"));
217 if (reader
->status
!= PACKET_READ_FLUSH
)
218 die(_("git fetch-pack: expected a flush packet after shallow list"));
222 static enum ack_type
get_ack(struct packet_reader
*reader
,
223 struct object_id
*result_oid
)
228 if (packet_reader_read(reader
) != PACKET_READ_NORMAL
)
229 die(_("git fetch-pack: expected ACK/NAK, got a flush packet"));
230 len
= reader
->pktlen
;
232 if (!strcmp(reader
->line
, "NAK"))
234 if (skip_prefix(reader
->line
, "ACK ", &arg
)) {
236 if (!parse_oid_hex(arg
, result_oid
, &p
)) {
237 len
-= p
- reader
->line
;
240 if (strstr(p
, "continue"))
242 if (strstr(p
, "common"))
244 if (strstr(p
, "ready"))
249 die(_("git fetch-pack: expected ACK/NAK, got '%s'"), reader
->line
);
252 static void send_request(struct fetch_pack_args
*args
,
253 int fd
, struct strbuf
*buf
)
255 if (args
->stateless_rpc
) {
256 send_sideband(fd
, -1, buf
->buf
, buf
->len
, LARGE_PACKET_MAX
);
259 if (write_in_full(fd
, buf
->buf
, buf
->len
) < 0)
260 die_errno(_("unable to write to remote"));
264 static void insert_one_alternate_object(struct fetch_negotiator
*negotiator
,
267 rev_list_insert_ref(negotiator
, &obj
->oid
);
270 #define INITIAL_FLUSH 16
271 #define PIPESAFE_FLUSH 32
272 #define LARGE_FLUSH 16384
274 static int next_flush(int stateless_rpc
, int count
)
277 if (count
< LARGE_FLUSH
)
280 count
= count
* 11 / 10;
282 if (count
< PIPESAFE_FLUSH
)
285 count
+= PIPESAFE_FLUSH
;
290 static void mark_tips(struct fetch_negotiator
*negotiator
,
291 const struct oid_array
*negotiation_tips
)
295 if (!negotiation_tips
) {
296 for_each_rawref(rev_list_insert_ref_oid
, negotiator
);
300 for (i
= 0; i
< negotiation_tips
->nr
; i
++)
301 rev_list_insert_ref(negotiator
, &negotiation_tips
->oid
[i
]);
305 static void send_filter(struct fetch_pack_args
*args
,
306 struct strbuf
*req_buf
,
307 int server_supports_filter
)
309 if (args
->filter_options
.choice
) {
311 expand_list_objects_filter_spec(&args
->filter_options
);
312 if (server_supports_filter
) {
313 print_verbose(args
, _("Server supports filter"));
314 packet_buf_write(req_buf
, "filter %s", spec
);
315 trace2_data_string("fetch", the_repository
,
316 "filter/effective", spec
);
318 warning("filtering not recognized by server, ignoring");
319 trace2_data_string("fetch", the_repository
,
320 "filter/unsupported", spec
);
323 trace2_data_string("fetch", the_repository
,
328 static int find_common(struct fetch_negotiator
*negotiator
,
329 struct fetch_pack_args
*args
,
330 int fd
[2], struct object_id
*result_oid
,
334 int count
= 0, flushes
= 0, flush_at
= INITIAL_FLUSH
, retval
;
335 int negotiation_round
= 0, haves
= 0;
336 const struct object_id
*oid
;
337 unsigned in_vain
= 0;
338 int got_continue
= 0;
340 struct strbuf req_buf
= STRBUF_INIT
;
341 size_t state_len
= 0;
342 struct packet_reader reader
;
344 if (args
->stateless_rpc
&& multi_ack
== 1)
345 die(_("the option '%s' requires '%s'"), "--stateless-rpc", "multi_ack_detailed");
347 packet_reader_init(&reader
, fd
[0], NULL
, 0,
348 PACKET_READ_CHOMP_NEWLINE
|
349 PACKET_READ_DIE_ON_ERR_PACKET
);
351 mark_tips(negotiator
, args
->negotiation_tips
);
352 for_each_cached_alternate(negotiator
, insert_one_alternate_object
);
355 for ( ; refs
; refs
= refs
->next
) {
356 struct object_id
*remote
= &refs
->old_oid
;
357 const char *remote_hex
;
360 if (!args
->refetch
) {
362 * If that object is complete (i.e. it is an ancestor of a
363 * local ref), we tell them we have it but do not have to
364 * tell them about its ancestors, which they already know
367 * We use lookup_object here because we are only
368 * interested in the case we *know* the object is
369 * reachable and we have already scanned it.
371 if (((o
= lookup_object(the_repository
, remote
)) != NULL
) &&
372 (o
->flags
& COMPLETE
)) {
377 remote_hex
= oid_to_hex(remote
);
379 struct strbuf c
= STRBUF_INIT
;
380 if (multi_ack
== 2) strbuf_addstr(&c
, " multi_ack_detailed");
381 if (multi_ack
== 1) strbuf_addstr(&c
, " multi_ack");
382 if (no_done
) strbuf_addstr(&c
, " no-done");
383 if (use_sideband
== 2) strbuf_addstr(&c
, " side-band-64k");
384 if (use_sideband
== 1) strbuf_addstr(&c
, " side-band");
385 if (args
->deepen_relative
) strbuf_addstr(&c
, " deepen-relative");
386 if (args
->use_thin_pack
) strbuf_addstr(&c
, " thin-pack");
387 if (args
->no_progress
) strbuf_addstr(&c
, " no-progress");
388 if (args
->include_tag
) strbuf_addstr(&c
, " include-tag");
389 if (prefer_ofs_delta
) strbuf_addstr(&c
, " ofs-delta");
390 if (deepen_since_ok
) strbuf_addstr(&c
, " deepen-since");
391 if (deepen_not_ok
) strbuf_addstr(&c
, " deepen-not");
392 if (agent_supported
) strbuf_addf(&c
, " agent=%s",
393 git_user_agent_sanitized());
395 strbuf_addf(&c
, " session-id=%s", trace2_session_id());
396 if (args
->filter_options
.choice
)
397 strbuf_addstr(&c
, " filter");
398 packet_buf_write(&req_buf
, "want %s%s\n", remote_hex
, c
.buf
);
401 packet_buf_write(&req_buf
, "want %s\n", remote_hex
);
406 strbuf_release(&req_buf
);
411 if (is_repository_shallow(the_repository
))
412 write_shallow_commits(&req_buf
, 1, NULL
);
414 packet_buf_write(&req_buf
, "deepen %d", args
->depth
);
415 if (args
->deepen_since
) {
416 timestamp_t max_age
= approxidate(args
->deepen_since
);
417 packet_buf_write(&req_buf
, "deepen-since %"PRItime
, max_age
);
419 if (args
->deepen_not
) {
421 for (i
= 0; i
< args
->deepen_not
->nr
; i
++) {
422 struct string_list_item
*s
= args
->deepen_not
->items
+ i
;
423 packet_buf_write(&req_buf
, "deepen-not %s", s
->string
);
426 send_filter(args
, &req_buf
, server_supports_filtering
);
427 packet_buf_flush(&req_buf
);
428 state_len
= req_buf
.len
;
432 struct object_id oid
;
434 send_request(args
, fd
[1], &req_buf
);
435 while (packet_reader_read(&reader
) == PACKET_READ_NORMAL
) {
436 if (skip_prefix(reader
.line
, "shallow ", &arg
)) {
437 if (get_oid_hex(arg
, &oid
))
438 die(_("invalid shallow line: %s"), reader
.line
);
439 register_shallow(the_repository
, &oid
);
442 if (skip_prefix(reader
.line
, "unshallow ", &arg
)) {
443 if (get_oid_hex(arg
, &oid
))
444 die(_("invalid unshallow line: %s"), reader
.line
);
445 if (!lookup_object(the_repository
, &oid
))
446 die(_("object not found: %s"), reader
.line
);
447 /* make sure that it is parsed as shallow */
448 if (!parse_object(the_repository
, &oid
))
449 die(_("error in object: %s"), reader
.line
);
450 if (unregister_shallow(&oid
))
451 die(_("no shallow found: %s"), reader
.line
);
454 die(_("expected shallow/unshallow, got %s"), reader
.line
);
456 } else if (!args
->stateless_rpc
)
457 send_request(args
, fd
[1], &req_buf
);
459 if (!args
->stateless_rpc
) {
460 /* If we aren't using the stateless-rpc interface
461 * we don't need to retain the headers.
463 strbuf_setlen(&req_buf
, 0);
467 trace2_region_enter("fetch-pack", "negotiation_v0_v1", the_repository
);
470 while ((oid
= negotiator
->next(negotiator
))) {
471 packet_buf_write(&req_buf
, "have %s\n", oid_to_hex(oid
));
472 print_verbose(args
, "have %s", oid_to_hex(oid
));
475 if (flush_at
<= ++count
) {
479 trace2_region_enter_printf("negotiation_v0_v1", "round",
480 the_repository
, "%d",
482 trace2_data_intmax("negotiation_v0_v1", the_repository
,
483 "haves_added", haves
);
484 trace2_data_intmax("negotiation_v0_v1", the_repository
,
487 packet_buf_flush(&req_buf
);
488 send_request(args
, fd
[1], &req_buf
);
489 strbuf_setlen(&req_buf
, state_len
);
491 flush_at
= next_flush(args
->stateless_rpc
, count
);
494 * We keep one window "ahead" of the other side, and
495 * will wait for an ACK only on the next one
497 if (!args
->stateless_rpc
&& count
== INITIAL_FLUSH
)
500 consume_shallow_list(args
, &reader
);
502 ack
= get_ack(&reader
, result_oid
);
504 print_verbose(args
, _("got %s %d %s"), "ack",
505 ack
, oid_to_hex(result_oid
));
508 trace2_region_leave_printf("negotiation_v0_v1", "round",
509 the_repository
, "%d",
518 struct commit
*commit
=
519 lookup_commit(the_repository
,
524 die(_("invalid commit %s"), oid_to_hex(result_oid
));
525 was_common
= negotiator
->ack(negotiator
, commit
);
526 if (args
->stateless_rpc
529 /* We need to replay the have for this object
530 * on the next RPC request so the peer knows
531 * it is in common with us.
533 const char *hex
= oid_to_hex(result_oid
);
534 packet_buf_write(&req_buf
, "have %s\n", hex
);
535 state_len
= req_buf
.len
;
538 * Reset in_vain because an ack
539 * for this commit has not been
543 } else if (!args
->stateless_rpc
544 || ack
!= ACK_common
)
548 if (ack
== ACK_ready
)
555 trace2_region_leave_printf("negotiation_v0_v1", "round",
556 the_repository
, "%d",
558 if (got_continue
&& MAX_IN_VAIN
< in_vain
) {
559 print_verbose(args
, _("giving up"));
567 trace2_region_leave("fetch-pack", "negotiation_v0_v1", the_repository
);
568 trace2_data_intmax("negotiation_v0_v1", the_repository
, "total_rounds",
570 if (!got_ready
|| !no_done
) {
571 packet_buf_write(&req_buf
, "done\n");
572 send_request(args
, fd
[1], &req_buf
);
574 print_verbose(args
, _("done"));
579 strbuf_release(&req_buf
);
581 if (!got_ready
|| !no_done
)
582 consume_shallow_list(args
, &reader
);
583 while (flushes
|| multi_ack
) {
584 int ack
= get_ack(&reader
, result_oid
);
586 print_verbose(args
, _("got %s (%d) %s"), "ack",
587 ack
, oid_to_hex(result_oid
));
595 /* it is no error to fetch into a completely empty repo */
596 return count
? retval
: 0;
599 static struct commit_list
*complete
;
601 static int mark_complete(const struct object_id
*oid
)
603 struct commit
*commit
= deref_without_lazy_fetch(oid
, 1);
605 if (commit
&& !(commit
->object
.flags
& COMPLETE
)) {
606 commit
->object
.flags
|= COMPLETE
;
607 commit_list_insert(commit
, &complete
);
612 static int mark_complete_oid(const char *refname UNUSED
,
613 const struct object_id
*oid
,
615 void *cb_data UNUSED
)
617 return mark_complete(oid
);
620 static void mark_recent_complete_commits(struct fetch_pack_args
*args
,
623 while (complete
&& cutoff
<= complete
->item
->date
) {
624 print_verbose(args
, _("Marking %s as complete"),
625 oid_to_hex(&complete
->item
->object
.oid
));
626 pop_most_recent_commit(&complete
, COMPLETE
);
630 static void add_refs_to_oidset(struct oidset
*oids
, struct ref
*refs
)
632 for (; refs
; refs
= refs
->next
)
633 oidset_insert(oids
, &refs
->old_oid
);
636 static int is_unmatched_ref(const struct ref
*ref
)
638 struct object_id oid
;
640 return ref
->match_status
== REF_NOT_MATCHED
&&
641 !parse_oid_hex(ref
->name
, &oid
, &p
) &&
643 oideq(&oid
, &ref
->old_oid
);
646 static void filter_refs(struct fetch_pack_args
*args
,
648 struct ref
**sought
, int nr_sought
)
650 struct ref
*newlist
= NULL
;
651 struct ref
**newtail
= &newlist
;
652 struct ref
*unmatched
= NULL
;
653 struct ref
*ref
, *next
;
654 struct oidset tip_oids
= OIDSET_INIT
;
656 int strict
= !(allow_unadvertised_object_request
&
657 (ALLOW_TIP_SHA1
| ALLOW_REACHABLE_SHA1
));
660 for (ref
= *refs
; ref
; ref
= next
) {
664 if (starts_with(ref
->name
, "refs/") &&
665 check_refname_format(ref
->name
, 0)) {
667 * trash or a peeled value; do not even add it to
673 while (i
< nr_sought
) {
674 int cmp
= strcmp(ref
->name
, sought
[i
]->name
);
676 break; /* definitely do not have it */
678 keep
= 1; /* definitely have it */
679 sought
[i
]->match_status
= REF_MATCHED
;
684 if (!keep
&& args
->fetch_all
&&
685 (!args
->deepen
|| !starts_with(ref
->name
, "refs/tags/")))
692 newtail
= &ref
->next
;
694 ref
->next
= unmatched
;
700 for (i
= 0; i
< nr_sought
; i
++) {
702 if (!is_unmatched_ref(ref
))
705 add_refs_to_oidset(&tip_oids
, unmatched
);
706 add_refs_to_oidset(&tip_oids
, newlist
);
711 /* Append unmatched requests to the list */
712 for (i
= 0; i
< nr_sought
; i
++) {
714 if (!is_unmatched_ref(ref
))
717 if (!strict
|| oidset_contains(&tip_oids
, &ref
->old_oid
)) {
718 ref
->match_status
= REF_MATCHED
;
719 *newtail
= copy_ref(ref
);
720 newtail
= &(*newtail
)->next
;
722 ref
->match_status
= REF_UNADVERTISED_NOT_ALLOWED
;
726 oidset_clear(&tip_oids
);
727 free_refs(unmatched
);
732 static void mark_alternate_complete(struct fetch_negotiator
*negotiator UNUSED
,
735 mark_complete(&obj
->oid
);
738 struct loose_object_iter
{
739 struct oidset
*loose_object_set
;
744 * Mark recent commits available locally and reachable from a local ref as
747 * The cutoff time for recency is determined by this heuristic: it is the
748 * earliest commit time of the objects in refs that are commits and that we know
749 * the commit time of.
751 static void mark_complete_and_common_ref(struct fetch_negotiator
*negotiator
,
752 struct fetch_pack_args
*args
,
756 int old_save_commit_buffer
= save_commit_buffer
;
757 timestamp_t cutoff
= 0;
762 save_commit_buffer
= 0;
764 trace2_region_enter("fetch-pack", "parse_remote_refs_and_find_cutoff", NULL
);
765 for (ref
= *refs
; ref
; ref
= ref
->next
) {
766 struct commit
*commit
;
768 commit
= lookup_commit_in_graph(the_repository
, &ref
->old_oid
);
772 if (!repo_has_object_file_with_flags(the_repository
, &ref
->old_oid
,
774 OBJECT_INFO_SKIP_FETCH_OBJECT
))
776 o
= parse_object(the_repository
, &ref
->old_oid
);
777 if (!o
|| o
->type
!= OBJ_COMMIT
)
780 commit
= (struct commit
*)o
;
784 * We already have it -- which may mean that we were
785 * in sync with the other side at some time after
786 * that (it is OK if we guess wrong here).
788 if (!cutoff
|| cutoff
< commit
->date
)
789 cutoff
= commit
->date
;
791 trace2_region_leave("fetch-pack", "parse_remote_refs_and_find_cutoff", NULL
);
794 * This block marks all local refs as COMPLETE, and then recursively marks all
795 * parents of those refs as COMPLETE.
797 trace2_region_enter("fetch-pack", "mark_complete_local_refs", NULL
);
799 for_each_rawref(mark_complete_oid
, NULL
);
800 for_each_cached_alternate(NULL
, mark_alternate_complete
);
801 commit_list_sort_by_date(&complete
);
803 mark_recent_complete_commits(args
, cutoff
);
805 trace2_region_leave("fetch-pack", "mark_complete_local_refs", NULL
);
808 * Mark all complete remote refs as common refs.
809 * Don't mark them common yet; the server has to be told so first.
811 trace2_region_enter("fetch-pack", "mark_common_remote_refs", NULL
);
812 for (ref
= *refs
; ref
; ref
= ref
->next
) {
813 struct commit
*c
= deref_without_lazy_fetch(&ref
->old_oid
, 0);
815 if (!c
|| !(c
->object
.flags
& COMPLETE
))
818 negotiator
->known_common(negotiator
, c
);
820 trace2_region_leave("fetch-pack", "mark_common_remote_refs", NULL
);
822 save_commit_buffer
= old_save_commit_buffer
;
826 * Returns 1 if every object pointed to by the given remote refs is available
827 * locally and reachable from a local ref, and 0 otherwise.
829 static int everything_local(struct fetch_pack_args
*args
,
835 for (retval
= 1, ref
= *refs
; ref
; ref
= ref
->next
) {
836 const struct object_id
*remote
= &ref
->old_oid
;
839 o
= lookup_object(the_repository
, remote
);
840 if (!o
|| !(o
->flags
& COMPLETE
)) {
842 print_verbose(args
, "want %s (%s)", oid_to_hex(remote
),
846 print_verbose(args
, _("already have %s (%s)"), oid_to_hex(remote
),
853 static int sideband_demux(int in UNUSED
, int out
, void *data
)
858 ret
= recv_sideband("fetch-pack", xd
[0], out
);
863 static void create_promisor_file(const char *keep_name
,
864 struct ref
**sought
, int nr_sought
)
866 struct strbuf promisor_name
= STRBUF_INIT
;
869 strbuf_addstr(&promisor_name
, keep_name
);
870 suffix_stripped
= strbuf_strip_suffix(&promisor_name
, ".keep");
871 if (!suffix_stripped
)
872 BUG("name of pack lockfile should end with .keep (was '%s')",
874 strbuf_addstr(&promisor_name
, ".promisor");
876 write_promisor_file(promisor_name
.buf
, sought
, nr_sought
);
878 strbuf_release(&promisor_name
);
881 static void parse_gitmodules_oids(int fd
, struct oidset
*gitmodules_oids
)
883 int len
= the_hash_algo
->hexsz
+ 1; /* hash + NL */
886 char hex_hash
[GIT_MAX_HEXSZ
+ 1];
887 int read_len
= read_in_full(fd
, hex_hash
, len
);
888 struct object_id oid
;
894 die("invalid length read %d", read_len
);
895 if (parse_oid_hex(hex_hash
, &oid
, &end
) || *end
!= '\n')
897 oidset_insert(gitmodules_oids
, &oid
);
901 static void add_index_pack_keep_option(struct strvec
*args
)
903 char hostname
[HOST_NAME_MAX
+ 1];
905 if (xgethostname(hostname
, sizeof(hostname
)))
906 xsnprintf(hostname
, sizeof(hostname
), "localhost");
907 strvec_pushf(args
, "--keep=fetch-pack %"PRIuMAX
" on %s",
908 (uintmax_t)getpid(), hostname
);
912 * If packfile URIs were provided, pass a non-NULL pointer to index_pack_args.
913 * The strings to pass as the --index-pack-arg arguments to http-fetch will be
914 * stored there. (It must be freed by the caller.)
916 static int get_pack(struct fetch_pack_args
*args
,
917 int xd
[2], struct string_list
*pack_lockfiles
,
918 struct strvec
*index_pack_args
,
919 struct ref
**sought
, int nr_sought
,
920 struct oidset
*gitmodules_oids
)
923 int do_keep
= args
->keep_pack
;
924 const char *cmd_name
;
925 struct pack_header header
;
927 struct child_process cmd
= CHILD_PROCESS_INIT
;
928 int fsck_objects
= 0;
931 memset(&demux
, 0, sizeof(demux
));
933 /* xd[] is talking with upload-pack; subprocess reads from
934 * xd[0], spits out band#2 to stderr, and feeds us band#1
935 * through demux->out.
937 demux
.proc
= sideband_demux
;
940 demux
.isolate_sigpipe
= 1;
941 if (start_async(&demux
))
942 die(_("fetch-pack: unable to fork off sideband demultiplexer"));
947 if (!args
->keep_pack
&& unpack_limit
&& !index_pack_args
) {
949 if (read_pack_header(demux
.out
, &header
))
950 die(_("protocol error: bad pack header"));
952 if (ntohl(header
.hdr_entries
) < unpack_limit
)
958 if (alternate_shallow_file
) {
959 strvec_push(&cmd
.args
, "--shallow-file");
960 strvec_push(&cmd
.args
, alternate_shallow_file
);
963 if (fetch_fsck_objects
>= 0
965 : transfer_fsck_objects
>= 0
966 ? transfer_fsck_objects
970 if (do_keep
|| args
->from_promisor
|| index_pack_args
|| fsck_objects
) {
971 if (pack_lockfiles
|| fsck_objects
)
973 cmd_name
= "index-pack";
974 strvec_push(&cmd
.args
, cmd_name
);
975 strvec_push(&cmd
.args
, "--stdin");
976 if (!args
->quiet
&& !args
->no_progress
)
977 strvec_push(&cmd
.args
, "-v");
978 if (args
->use_thin_pack
)
979 strvec_push(&cmd
.args
, "--fix-thin");
980 if ((do_keep
|| index_pack_args
) && (args
->lock_pack
|| unpack_limit
))
981 add_index_pack_keep_option(&cmd
.args
);
982 if (!index_pack_args
&& args
->check_self_contained_and_connected
)
983 strvec_push(&cmd
.args
, "--check-self-contained-and-connected");
986 * We cannot perform any connectivity checks because
987 * not all packs have been downloaded; let the caller
988 * have this responsibility.
990 args
->check_self_contained_and_connected
= 0;
992 if (args
->from_promisor
)
994 * create_promisor_file() may be called afterwards but
995 * we still need index-pack to know that this is a
996 * promisor pack. For example, if transfer.fsckobjects
997 * is true, index-pack needs to know that .gitmodules
998 * is a promisor object (so that it won't complain if
1001 strvec_push(&cmd
.args
, "--promisor");
1004 cmd_name
= "unpack-objects";
1005 strvec_push(&cmd
.args
, cmd_name
);
1006 if (args
->quiet
|| args
->no_progress
)
1007 strvec_push(&cmd
.args
, "-q");
1008 args
->check_self_contained_and_connected
= 0;
1012 strvec_pushf(&cmd
.args
, "--pack_header=%"PRIu32
",%"PRIu32
,
1013 ntohl(header
.hdr_version
),
1014 ntohl(header
.hdr_entries
));
1016 if (args
->from_promisor
|| index_pack_args
)
1018 * We cannot use --strict in index-pack because it
1019 * checks both broken objects and links, but we only
1020 * want to check for broken objects.
1022 strvec_push(&cmd
.args
, "--fsck-objects");
1024 strvec_pushf(&cmd
.args
, "--strict%s",
1025 fsck_msg_types
.buf
);
1028 if (index_pack_args
) {
1031 for (i
= 0; i
< cmd
.args
.nr
; i
++)
1032 strvec_push(index_pack_args
, cmd
.args
.v
[i
]);
1035 sigchain_push(SIGPIPE
, SIG_IGN
);
1039 if (start_command(&cmd
))
1040 die(_("fetch-pack: unable to fork off %s"), cmd_name
);
1041 if (do_keep
&& (pack_lockfiles
|| fsck_objects
)) {
1043 char *pack_lockfile
= index_pack_lockfile(cmd
.out
, &is_well_formed
);
1045 if (!is_well_formed
)
1046 die(_("fetch-pack: invalid index-pack output"));
1048 string_list_append_nodup(pack_lockfiles
, pack_lockfile
);
1049 parse_gitmodules_oids(cmd
.out
, gitmodules_oids
);
1054 /* Closed by start_command() */
1057 ret
= finish_command(&cmd
);
1058 if (!ret
|| (args
->check_self_contained_and_connected
&& ret
== 1))
1059 args
->self_contained_and_connected
=
1060 args
->check_self_contained_and_connected
&&
1063 die(_("%s failed"), cmd_name
);
1064 if (use_sideband
&& finish_async(&demux
))
1065 die(_("error in sideband demultiplexer"));
1067 sigchain_pop(SIGPIPE
);
1070 * Now that index-pack has succeeded, write the promisor file using the
1071 * obtained .keep filename if necessary
1073 if (do_keep
&& pack_lockfiles
&& pack_lockfiles
->nr
&& args
->from_promisor
)
1074 create_promisor_file(pack_lockfiles
->items
[0].string
, sought
, nr_sought
);
1079 static int ref_compare_name(const struct ref
*a
, const struct ref
*b
)
1081 return strcmp(a
->name
, b
->name
);
1084 DEFINE_LIST_SORT(static, sort_ref_list
, struct ref
, next
);
1086 static int cmp_ref_by_name(const void *a_
, const void *b_
)
1088 const struct ref
*a
= *((const struct ref
**)a_
);
1089 const struct ref
*b
= *((const struct ref
**)b_
);
1090 return strcmp(a
->name
, b
->name
);
1093 static struct ref
*do_fetch_pack(struct fetch_pack_args
*args
,
1095 const struct ref
*orig_ref
,
1096 struct ref
**sought
, int nr_sought
,
1097 struct shallow_info
*si
,
1098 struct string_list
*pack_lockfiles
)
1100 struct repository
*r
= the_repository
;
1101 struct ref
*ref
= copy_ref_list(orig_ref
);
1102 struct object_id oid
;
1103 const char *agent_feature
;
1105 struct fetch_negotiator negotiator_alloc
;
1106 struct fetch_negotiator
*negotiator
;
1108 negotiator
= &negotiator_alloc
;
1109 if (args
->refetch
) {
1110 fetch_negotiator_init_noop(negotiator
);
1112 fetch_negotiator_init(r
, negotiator
);
1115 sort_ref_list(&ref
, ref_compare_name
);
1116 QSORT(sought
, nr_sought
, cmp_ref_by_name
);
1118 if ((agent_feature
= server_feature_value("agent", &agent_len
))) {
1119 agent_supported
= 1;
1121 print_verbose(args
, _("Server version is %.*s"),
1122 (int)agent_len
, agent_feature
);
1125 if (!server_supports("session-id"))
1128 if (server_supports("shallow"))
1129 print_verbose(args
, _("Server supports %s"), "shallow");
1130 else if (args
->depth
> 0 || is_repository_shallow(r
))
1131 die(_("Server does not support shallow clients"));
1132 if (args
->depth
> 0 || args
->deepen_since
|| args
->deepen_not
)
1134 if (server_supports("multi_ack_detailed")) {
1135 print_verbose(args
, _("Server supports %s"), "multi_ack_detailed");
1137 if (server_supports("no-done")) {
1138 print_verbose(args
, _("Server supports %s"), "no-done");
1139 if (args
->stateless_rpc
)
1143 else if (server_supports("multi_ack")) {
1144 print_verbose(args
, _("Server supports %s"), "multi_ack");
1147 if (server_supports("side-band-64k")) {
1148 print_verbose(args
, _("Server supports %s"), "side-band-64k");
1151 else if (server_supports("side-band")) {
1152 print_verbose(args
, _("Server supports %s"), "side-band");
1155 if (server_supports("allow-tip-sha1-in-want")) {
1156 print_verbose(args
, _("Server supports %s"), "allow-tip-sha1-in-want");
1157 allow_unadvertised_object_request
|= ALLOW_TIP_SHA1
;
1159 if (server_supports("allow-reachable-sha1-in-want")) {
1160 print_verbose(args
, _("Server supports %s"), "allow-reachable-sha1-in-want");
1161 allow_unadvertised_object_request
|= ALLOW_REACHABLE_SHA1
;
1163 if (server_supports("thin-pack"))
1164 print_verbose(args
, _("Server supports %s"), "thin-pack");
1166 args
->use_thin_pack
= 0;
1167 if (server_supports("no-progress"))
1168 print_verbose(args
, _("Server supports %s"), "no-progress");
1170 args
->no_progress
= 0;
1171 if (server_supports("include-tag"))
1172 print_verbose(args
, _("Server supports %s"), "include-tag");
1174 args
->include_tag
= 0;
1175 if (server_supports("ofs-delta"))
1176 print_verbose(args
, _("Server supports %s"), "ofs-delta");
1178 prefer_ofs_delta
= 0;
1180 if (server_supports("filter")) {
1181 server_supports_filtering
= 1;
1182 print_verbose(args
, _("Server supports %s"), "filter");
1183 } else if (args
->filter_options
.choice
) {
1184 warning("filtering not recognized by server, ignoring");
1187 if (server_supports("deepen-since")) {
1188 print_verbose(args
, _("Server supports %s"), "deepen-since");
1189 deepen_since_ok
= 1;
1190 } else if (args
->deepen_since
)
1191 die(_("Server does not support --shallow-since"));
1192 if (server_supports("deepen-not")) {
1193 print_verbose(args
, _("Server supports %s"), "deepen-not");
1195 } else if (args
->deepen_not
)
1196 die(_("Server does not support --shallow-exclude"));
1197 if (server_supports("deepen-relative"))
1198 print_verbose(args
, _("Server supports %s"), "deepen-relative");
1199 else if (args
->deepen_relative
)
1200 die(_("Server does not support --deepen"));
1201 if (!server_supports_hash(the_hash_algo
->name
, NULL
))
1202 die(_("Server does not support this repository's object format"));
1204 mark_complete_and_common_ref(negotiator
, args
, &ref
);
1205 filter_refs(args
, &ref
, sought
, nr_sought
);
1206 if (!args
->refetch
&& everything_local(args
, &ref
)) {
1207 packet_flush(fd
[1]);
1210 if (find_common(negotiator
, args
, fd
, &oid
, ref
) < 0)
1211 if (!args
->keep_pack
)
1212 /* When cloning, it is not unusual to have
1215 warning(_("no common commits"));
1217 if (args
->stateless_rpc
)
1218 packet_flush(fd
[1]);
1220 setup_alternate_shallow(&shallow_lock
, &alternate_shallow_file
,
1222 else if (si
->nr_ours
|| si
->nr_theirs
) {
1223 if (args
->reject_shallow_remote
)
1224 die(_("source repository is shallow, reject to clone."));
1225 alternate_shallow_file
= setup_temporary_shallow(si
->shallow
);
1227 alternate_shallow_file
= NULL
;
1228 if (get_pack(args
, fd
, pack_lockfiles
, NULL
, sought
, nr_sought
,
1229 &fsck_options
.gitmodules_found
))
1230 die(_("git fetch-pack: fetch failed."));
1231 if (fsck_finish(&fsck_options
))
1236 negotiator
->release(negotiator
);
1240 static void add_shallow_requests(struct strbuf
*req_buf
,
1241 const struct fetch_pack_args
*args
)
1243 if (is_repository_shallow(the_repository
))
1244 write_shallow_commits(req_buf
, 1, NULL
);
1245 if (args
->depth
> 0)
1246 packet_buf_write(req_buf
, "deepen %d", args
->depth
);
1247 if (args
->deepen_since
) {
1248 timestamp_t max_age
= approxidate(args
->deepen_since
);
1249 packet_buf_write(req_buf
, "deepen-since %"PRItime
, max_age
);
1251 if (args
->deepen_not
) {
1253 for (i
= 0; i
< args
->deepen_not
->nr
; i
++) {
1254 struct string_list_item
*s
= args
->deepen_not
->items
+ i
;
1255 packet_buf_write(req_buf
, "deepen-not %s", s
->string
);
1258 if (args
->deepen_relative
)
1259 packet_buf_write(req_buf
, "deepen-relative\n");
1262 static void add_wants(const struct ref
*wants
, struct strbuf
*req_buf
)
1264 int use_ref_in_want
= server_supports_feature("fetch", "ref-in-want", 0);
1266 for ( ; wants
; wants
= wants
->next
) {
1267 const struct object_id
*remote
= &wants
->old_oid
;
1271 * If that object is complete (i.e. it is an ancestor of a
1272 * local ref), we tell them we have it but do not have to
1273 * tell them about its ancestors, which they already know
1276 * We use lookup_object here because we are only
1277 * interested in the case we *know* the object is
1278 * reachable and we have already scanned it.
1280 if (((o
= lookup_object(the_repository
, remote
)) != NULL
) &&
1281 (o
->flags
& COMPLETE
)) {
1285 if (!use_ref_in_want
|| wants
->exact_oid
)
1286 packet_buf_write(req_buf
, "want %s\n", oid_to_hex(remote
));
1288 packet_buf_write(req_buf
, "want-ref %s\n", wants
->name
);
1292 static void add_common(struct strbuf
*req_buf
, struct oidset
*common
)
1294 struct oidset_iter iter
;
1295 const struct object_id
*oid
;
1296 oidset_iter_init(common
, &iter
);
1298 while ((oid
= oidset_iter_next(&iter
))) {
1299 packet_buf_write(req_buf
, "have %s\n", oid_to_hex(oid
));
1303 static int add_haves(struct fetch_negotiator
*negotiator
,
1304 struct strbuf
*req_buf
,
1307 int haves_added
= 0;
1308 const struct object_id
*oid
;
1310 while ((oid
= negotiator
->next(negotiator
))) {
1311 packet_buf_write(req_buf
, "have %s\n", oid_to_hex(oid
));
1312 if (++haves_added
>= *haves_to_send
)
1316 /* Increase haves to send on next round */
1317 *haves_to_send
= next_flush(1, *haves_to_send
);
1322 static void write_fetch_command_and_capabilities(struct strbuf
*req_buf
,
1323 const struct string_list
*server_options
)
1325 const char *hash_name
;
1327 ensure_server_supports_v2("fetch");
1328 packet_buf_write(req_buf
, "command=fetch");
1329 if (server_supports_v2("agent"))
1330 packet_buf_write(req_buf
, "agent=%s", git_user_agent_sanitized());
1331 if (advertise_sid
&& server_supports_v2("session-id"))
1332 packet_buf_write(req_buf
, "session-id=%s", trace2_session_id());
1333 if (server_options
&& server_options
->nr
) {
1335 ensure_server_supports_v2("server-option");
1336 for (i
= 0; i
< server_options
->nr
; i
++)
1337 packet_buf_write(req_buf
, "server-option=%s",
1338 server_options
->items
[i
].string
);
1341 if (server_feature_v2("object-format", &hash_name
)) {
1342 int hash_algo
= hash_algo_by_name(hash_name
);
1343 if (hash_algo_by_ptr(the_hash_algo
) != hash_algo
)
1344 die(_("mismatched algorithms: client %s; server %s"),
1345 the_hash_algo
->name
, hash_name
);
1346 packet_buf_write(req_buf
, "object-format=%s", the_hash_algo
->name
);
1347 } else if (hash_algo_by_ptr(the_hash_algo
) != GIT_HASH_SHA1
) {
1348 die(_("the server does not support algorithm '%s'"),
1349 the_hash_algo
->name
);
1351 packet_buf_delim(req_buf
);
1354 static int send_fetch_request(struct fetch_negotiator
*negotiator
, int fd_out
,
1355 struct fetch_pack_args
*args
,
1356 const struct ref
*wants
, struct oidset
*common
,
1357 int *haves_to_send
, int *in_vain
,
1358 int sideband_all
, int seen_ack
)
1362 struct strbuf req_buf
= STRBUF_INIT
;
1364 write_fetch_command_and_capabilities(&req_buf
, args
->server_options
);
1366 if (args
->use_thin_pack
)
1367 packet_buf_write(&req_buf
, "thin-pack");
1368 if (args
->no_progress
)
1369 packet_buf_write(&req_buf
, "no-progress");
1370 if (args
->include_tag
)
1371 packet_buf_write(&req_buf
, "include-tag");
1372 if (prefer_ofs_delta
)
1373 packet_buf_write(&req_buf
, "ofs-delta");
1375 packet_buf_write(&req_buf
, "sideband-all");
1377 /* Add shallow-info and deepen request */
1378 if (server_supports_feature("fetch", "shallow", 0))
1379 add_shallow_requests(&req_buf
, args
);
1380 else if (is_repository_shallow(the_repository
) || args
->deepen
)
1381 die(_("Server does not support shallow requests"));
1384 send_filter(args
, &req_buf
,
1385 server_supports_feature("fetch", "filter", 0));
1387 if (server_supports_feature("fetch", "packfile-uris", 0)) {
1389 struct strbuf to_send
= STRBUF_INIT
;
1391 for (i
= 0; i
< uri_protocols
.nr
; i
++) {
1392 const char *s
= uri_protocols
.items
[i
].string
;
1394 if (!strcmp(s
, "https") || !strcmp(s
, "http")) {
1396 strbuf_addch(&to_send
, ',');
1397 strbuf_addstr(&to_send
, s
);
1401 packet_buf_write(&req_buf
, "packfile-uris %s",
1403 strbuf_release(&to_send
);
1408 add_wants(wants
, &req_buf
);
1410 /* Add all of the common commits we've found in previous rounds */
1411 add_common(&req_buf
, common
);
1413 haves_added
= add_haves(negotiator
, &req_buf
, haves_to_send
);
1414 *in_vain
+= haves_added
;
1415 trace2_data_intmax("negotiation_v2", the_repository
, "haves_added", haves_added
);
1416 trace2_data_intmax("negotiation_v2", the_repository
, "in_vain", *in_vain
);
1417 if (!haves_added
|| (seen_ack
&& *in_vain
>= MAX_IN_VAIN
)) {
1419 packet_buf_write(&req_buf
, "done\n");
1424 packet_buf_flush(&req_buf
);
1425 if (write_in_full(fd_out
, req_buf
.buf
, req_buf
.len
) < 0)
1426 die_errno(_("unable to write request to remote"));
1428 strbuf_release(&req_buf
);
1433 * Processes a section header in a server's response and checks if it matches
1434 * `section`. If the value of `peek` is 1, the header line will be peeked (and
1435 * not consumed); if 0, the line will be consumed and the function will die if
1436 * the section header doesn't match what was expected.
1438 static int process_section_header(struct packet_reader
*reader
,
1439 const char *section
, int peek
)
1443 if (packet_reader_peek(reader
) == PACKET_READ_NORMAL
&&
1444 !strcmp(reader
->line
, section
))
1450 die(_("expected '%s', received '%s'"),
1451 section
, reader
->line
);
1453 die(_("expected '%s'"), section
);
1455 packet_reader_read(reader
);
1461 static int process_ack(struct fetch_negotiator
*negotiator
,
1462 struct packet_reader
*reader
,
1463 struct object_id
*common_oid
,
1464 int *received_ready
)
1466 while (packet_reader_read(reader
) == PACKET_READ_NORMAL
) {
1469 if (!strcmp(reader
->line
, "NAK"))
1472 if (skip_prefix(reader
->line
, "ACK ", &arg
)) {
1473 if (!get_oid_hex(arg
, common_oid
)) {
1474 struct commit
*commit
;
1475 commit
= lookup_commit(the_repository
, common_oid
);
1477 negotiator
->ack(negotiator
, commit
);
1482 if (!strcmp(reader
->line
, "ready")) {
1483 *received_ready
= 1;
1487 die(_("unexpected acknowledgment line: '%s'"), reader
->line
);
1490 if (reader
->status
!= PACKET_READ_FLUSH
&&
1491 reader
->status
!= PACKET_READ_DELIM
)
1492 die(_("error processing acks: %d"), reader
->status
);
1495 * If an "acknowledgments" section is sent, a packfile is sent if and
1496 * only if "ready" was sent in this section. The other sections
1497 * ("shallow-info" and "wanted-refs") are sent only if a packfile is
1498 * sent. Therefore, a DELIM is expected if "ready" is sent, and a FLUSH
1501 if (*received_ready
&& reader
->status
!= PACKET_READ_DELIM
)
1503 * TRANSLATORS: The parameter will be 'ready', a protocol
1506 die(_("expected packfile to be sent after '%s'"), "ready");
1507 if (!*received_ready
&& reader
->status
!= PACKET_READ_FLUSH
)
1509 * TRANSLATORS: The parameter will be 'ready', a protocol
1512 die(_("expected no other sections to be sent after no '%s'"), "ready");
1517 static void receive_shallow_info(struct fetch_pack_args
*args
,
1518 struct packet_reader
*reader
,
1519 struct oid_array
*shallows
,
1520 struct shallow_info
*si
)
1522 int unshallow_received
= 0;
1524 process_section_header(reader
, "shallow-info", 0);
1525 while (packet_reader_read(reader
) == PACKET_READ_NORMAL
) {
1527 struct object_id oid
;
1529 if (skip_prefix(reader
->line
, "shallow ", &arg
)) {
1530 if (get_oid_hex(arg
, &oid
))
1531 die(_("invalid shallow line: %s"), reader
->line
);
1532 oid_array_append(shallows
, &oid
);
1535 if (skip_prefix(reader
->line
, "unshallow ", &arg
)) {
1536 if (get_oid_hex(arg
, &oid
))
1537 die(_("invalid unshallow line: %s"), reader
->line
);
1538 if (!lookup_object(the_repository
, &oid
))
1539 die(_("object not found: %s"), reader
->line
);
1540 /* make sure that it is parsed as shallow */
1541 if (!parse_object(the_repository
, &oid
))
1542 die(_("error in object: %s"), reader
->line
);
1543 if (unregister_shallow(&oid
))
1544 die(_("no shallow found: %s"), reader
->line
);
1545 unshallow_received
= 1;
1548 die(_("expected shallow/unshallow, got %s"), reader
->line
);
1551 if (reader
->status
!= PACKET_READ_FLUSH
&&
1552 reader
->status
!= PACKET_READ_DELIM
)
1553 die(_("error processing shallow info: %d"), reader
->status
);
1555 if (args
->deepen
|| unshallow_received
) {
1557 * Treat these as shallow lines caused by our depth settings.
1558 * In v0, these lines cannot cause refs to be rejected; do the
1563 for (i
= 0; i
< shallows
->nr
; i
++)
1564 register_shallow(the_repository
, &shallows
->oid
[i
]);
1565 setup_alternate_shallow(&shallow_lock
, &alternate_shallow_file
,
1568 } else if (shallows
->nr
) {
1570 * Treat these as shallow lines caused by the remote being
1571 * shallow. In v0, remote refs that reach these objects are
1572 * rejected (unless --update-shallow is set); do the same.
1574 prepare_shallow_info(si
, shallows
);
1575 if (si
->nr_ours
|| si
->nr_theirs
) {
1576 if (args
->reject_shallow_remote
)
1577 die(_("source repository is shallow, reject to clone."));
1578 alternate_shallow_file
=
1579 setup_temporary_shallow(si
->shallow
);
1581 alternate_shallow_file
= NULL
;
1583 alternate_shallow_file
= NULL
;
1587 static int cmp_name_ref(const void *name
, const void *ref
)
1589 return strcmp(name
, (*(struct ref
**)ref
)->name
);
1592 static void receive_wanted_refs(struct packet_reader
*reader
,
1593 struct ref
**sought
, int nr_sought
)
1595 process_section_header(reader
, "wanted-refs", 0);
1596 while (packet_reader_read(reader
) == PACKET_READ_NORMAL
) {
1597 struct object_id oid
;
1601 if (parse_oid_hex(reader
->line
, &oid
, &end
) || *end
++ != ' ')
1602 die(_("expected wanted-ref, got '%s'"), reader
->line
);
1604 found
= bsearch(end
, sought
, nr_sought
, sizeof(*sought
),
1607 die(_("unexpected wanted-ref: '%s'"), reader
->line
);
1608 oidcpy(&(*found
)->old_oid
, &oid
);
1611 if (reader
->status
!= PACKET_READ_DELIM
)
1612 die(_("error processing wanted refs: %d"), reader
->status
);
1615 static void receive_packfile_uris(struct packet_reader
*reader
,
1616 struct string_list
*uris
)
1618 process_section_header(reader
, "packfile-uris", 0);
1619 while (packet_reader_read(reader
) == PACKET_READ_NORMAL
) {
1620 if (reader
->pktlen
< the_hash_algo
->hexsz
||
1621 reader
->line
[the_hash_algo
->hexsz
] != ' ')
1622 die("expected '<hash> <uri>', got: %s\n", reader
->line
);
1624 string_list_append(uris
, reader
->line
);
1626 if (reader
->status
!= PACKET_READ_DELIM
)
1627 die("expected DELIM");
1631 FETCH_CHECK_LOCAL
= 0,
1638 static void do_check_stateless_delimiter(int stateless_rpc
,
1639 struct packet_reader
*reader
)
1641 check_stateless_delimiter(stateless_rpc
, reader
,
1642 _("git fetch-pack: expected response end packet"));
1645 static struct ref
*do_fetch_pack_v2(struct fetch_pack_args
*args
,
1647 const struct ref
*orig_ref
,
1648 struct ref
**sought
, int nr_sought
,
1649 struct oid_array
*shallows
,
1650 struct shallow_info
*si
,
1651 struct string_list
*pack_lockfiles
)
1653 struct repository
*r
= the_repository
;
1654 struct ref
*ref
= copy_ref_list(orig_ref
);
1655 enum fetch_state state
= FETCH_CHECK_LOCAL
;
1656 struct oidset common
= OIDSET_INIT
;
1657 struct packet_reader reader
;
1658 int in_vain
= 0, negotiation_started
= 0;
1659 int negotiation_round
= 0;
1660 int haves_to_send
= INITIAL_FLUSH
;
1661 struct fetch_negotiator negotiator_alloc
;
1662 struct fetch_negotiator
*negotiator
;
1664 struct object_id common_oid
;
1665 int received_ready
= 0;
1666 struct string_list packfile_uris
= STRING_LIST_INIT_DUP
;
1668 struct strvec index_pack_args
= STRVEC_INIT
;
1670 negotiator
= &negotiator_alloc
;
1672 fetch_negotiator_init_noop(negotiator
);
1674 fetch_negotiator_init(r
, negotiator
);
1676 packet_reader_init(&reader
, fd
[0], NULL
, 0,
1677 PACKET_READ_CHOMP_NEWLINE
|
1678 PACKET_READ_DIE_ON_ERR_PACKET
);
1679 if (git_env_bool("GIT_TEST_SIDEBAND_ALL", 1) &&
1680 server_supports_feature("fetch", "sideband-all", 0)) {
1681 reader
.use_sideband
= 1;
1682 reader
.me
= "fetch-pack";
1685 while (state
!= FETCH_DONE
) {
1687 case FETCH_CHECK_LOCAL
:
1688 sort_ref_list(&ref
, ref_compare_name
);
1689 QSORT(sought
, nr_sought
, cmp_ref_by_name
);
1691 /* v2 supports these by default */
1692 allow_unadvertised_object_request
|= ALLOW_REACHABLE_SHA1
;
1694 if (args
->depth
> 0 || args
->deepen_since
|| args
->deepen_not
)
1697 /* Filter 'ref' by 'sought' and those that aren't local */
1698 mark_complete_and_common_ref(negotiator
, args
, &ref
);
1699 filter_refs(args
, &ref
, sought
, nr_sought
);
1700 if (!args
->refetch
&& everything_local(args
, &ref
))
1703 state
= FETCH_SEND_REQUEST
;
1705 mark_tips(negotiator
, args
->negotiation_tips
);
1706 for_each_cached_alternate(negotiator
,
1707 insert_one_alternate_object
);
1709 case FETCH_SEND_REQUEST
:
1710 if (!negotiation_started
) {
1711 negotiation_started
= 1;
1712 trace2_region_enter("fetch-pack",
1716 negotiation_round
++;
1717 trace2_region_enter_printf("negotiation_v2", "round",
1718 the_repository
, "%d",
1720 if (send_fetch_request(negotiator
, fd
[1], args
, ref
,
1722 &haves_to_send
, &in_vain
,
1723 reader
.use_sideband
,
1725 trace2_region_leave_printf("negotiation_v2", "round",
1726 the_repository
, "%d",
1728 state
= FETCH_GET_PACK
;
1731 state
= FETCH_PROCESS_ACKS
;
1733 case FETCH_PROCESS_ACKS
:
1734 /* Process ACKs/NAKs */
1735 process_section_header(&reader
, "acknowledgments", 0);
1736 while (process_ack(negotiator
, &reader
, &common_oid
,
1740 oidset_insert(&common
, &common_oid
);
1742 trace2_region_leave_printf("negotiation_v2", "round",
1743 the_repository
, "%d",
1745 if (received_ready
) {
1747 * Don't check for response delimiter; get_pack() will
1748 * read the rest of this response.
1750 state
= FETCH_GET_PACK
;
1752 do_check_stateless_delimiter(args
->stateless_rpc
, &reader
);
1753 state
= FETCH_SEND_REQUEST
;
1756 case FETCH_GET_PACK
:
1757 trace2_region_leave("fetch-pack",
1760 trace2_data_intmax("negotiation_v2", the_repository
,
1761 "total_rounds", negotiation_round
);
1762 /* Check for shallow-info section */
1763 if (process_section_header(&reader
, "shallow-info", 1))
1764 receive_shallow_info(args
, &reader
, shallows
, si
);
1766 if (process_section_header(&reader
, "wanted-refs", 1))
1767 receive_wanted_refs(&reader
, sought
, nr_sought
);
1769 /* get the pack(s) */
1770 if (git_env_bool("GIT_TRACE_REDACT", 1))
1771 reader
.options
|= PACKET_READ_REDACT_URI_PATH
;
1772 if (process_section_header(&reader
, "packfile-uris", 1))
1773 receive_packfile_uris(&reader
, &packfile_uris
);
1774 /* We don't expect more URIs. Reset to avoid expensive URI check. */
1775 reader
.options
&= ~PACKET_READ_REDACT_URI_PATH
;
1777 process_section_header(&reader
, "packfile", 0);
1780 * this is the final request we'll make of the server;
1781 * do a half-duplex shutdown to indicate that they can
1782 * hang up as soon as the pack is sent.
1787 if (get_pack(args
, fd
, pack_lockfiles
,
1788 packfile_uris
.nr
? &index_pack_args
: NULL
,
1789 sought
, nr_sought
, &fsck_options
.gitmodules_found
))
1790 die(_("git fetch-pack: fetch failed."));
1791 do_check_stateless_delimiter(args
->stateless_rpc
, &reader
);
1800 for (i
= 0; i
< packfile_uris
.nr
; i
++) {
1802 struct child_process cmd
= CHILD_PROCESS_INIT
;
1803 char packname
[GIT_MAX_HEXSZ
+ 1];
1804 const char *uri
= packfile_uris
.items
[i
].string
+
1805 the_hash_algo
->hexsz
+ 1;
1807 strvec_push(&cmd
.args
, "http-fetch");
1808 strvec_pushf(&cmd
.args
, "--packfile=%.*s",
1809 (int) the_hash_algo
->hexsz
,
1810 packfile_uris
.items
[i
].string
);
1811 for (j
= 0; j
< index_pack_args
.nr
; j
++)
1812 strvec_pushf(&cmd
.args
, "--index-pack-arg=%s",
1813 index_pack_args
.v
[j
]);
1814 strvec_push(&cmd
.args
, uri
);
1818 if (start_command(&cmd
))
1819 die("fetch-pack: unable to spawn http-fetch");
1821 if (read_in_full(cmd
.out
, packname
, 5) < 0 ||
1822 memcmp(packname
, "keep\t", 5))
1823 die("fetch-pack: expected keep then TAB at start of http-fetch output");
1825 if (read_in_full(cmd
.out
, packname
,
1826 the_hash_algo
->hexsz
+ 1) < 0 ||
1827 packname
[the_hash_algo
->hexsz
] != '\n')
1828 die("fetch-pack: expected hash then LF at end of http-fetch output");
1830 packname
[the_hash_algo
->hexsz
] = '\0';
1832 parse_gitmodules_oids(cmd
.out
, &fsck_options
.gitmodules_found
);
1836 if (finish_command(&cmd
))
1837 die("fetch-pack: unable to finish http-fetch");
1839 if (memcmp(packfile_uris
.items
[i
].string
, packname
,
1840 the_hash_algo
->hexsz
))
1841 die("fetch-pack: pack downloaded from %s does not match expected hash %.*s",
1842 uri
, (int) the_hash_algo
->hexsz
,
1843 packfile_uris
.items
[i
].string
);
1845 string_list_append_nodup(pack_lockfiles
,
1846 xstrfmt("%s/pack/pack-%s.keep",
1847 get_object_directory(),
1850 string_list_clear(&packfile_uris
, 0);
1851 strvec_clear(&index_pack_args
);
1853 if (fsck_finish(&fsck_options
))
1857 negotiator
->release(negotiator
);
1859 oidset_clear(&common
);
1863 static int fetch_pack_config_cb(const char *var
, const char *value
,
1864 const struct config_context
*ctx
, void *cb
)
1866 if (strcmp(var
, "fetch.fsck.skiplist") == 0) {
1869 if (git_config_pathname(&path
, var
, value
))
1871 strbuf_addf(&fsck_msg_types
, "%cskiplist=%s",
1872 fsck_msg_types
.len
? ',' : '=', path
);
1877 if (skip_prefix(var
, "fetch.fsck.", &var
)) {
1878 if (is_valid_msg_type(var
, value
))
1879 strbuf_addf(&fsck_msg_types
, "%c%s=%s",
1880 fsck_msg_types
.len
? ',' : '=', var
, value
);
1882 warning("Skipping unknown msg id '%s'", var
);
1886 return git_default_config(var
, value
, ctx
, cb
);
1889 static void fetch_pack_config(void)
1891 git_config_get_int("fetch.unpacklimit", &fetch_unpack_limit
);
1892 git_config_get_int("transfer.unpacklimit", &transfer_unpack_limit
);
1893 git_config_get_bool("repack.usedeltabaseoffset", &prefer_ofs_delta
);
1894 git_config_get_bool("fetch.fsckobjects", &fetch_fsck_objects
);
1895 git_config_get_bool("transfer.fsckobjects", &transfer_fsck_objects
);
1896 git_config_get_bool("transfer.advertisesid", &advertise_sid
);
1897 if (!uri_protocols
.nr
) {
1900 if (!git_config_get_string("fetch.uriprotocols", &str
) && str
) {
1901 string_list_split(&uri_protocols
, str
, ',', -1);
1906 git_config(fetch_pack_config_cb
, NULL
);
1909 static void fetch_pack_setup(void)
1911 static int did_setup
;
1914 fetch_pack_config();
1915 if (0 <= transfer_unpack_limit
)
1916 unpack_limit
= transfer_unpack_limit
;
1917 else if (0 <= fetch_unpack_limit
)
1918 unpack_limit
= fetch_unpack_limit
;
1922 static int remove_duplicates_in_refs(struct ref
**ref
, int nr
)
1924 struct string_list names
= STRING_LIST_INIT_NODUP
;
1927 for (src
= dst
= 0; src
< nr
; src
++) {
1928 struct string_list_item
*item
;
1929 item
= string_list_insert(&names
, ref
[src
]->name
);
1931 continue; /* already have it */
1932 item
->util
= ref
[src
];
1934 ref
[dst
] = ref
[src
];
1937 for (src
= dst
; src
< nr
; src
++)
1939 string_list_clear(&names
, 0);
1943 static void update_shallow(struct fetch_pack_args
*args
,
1944 struct ref
**sought
, int nr_sought
,
1945 struct shallow_info
*si
)
1947 struct oid_array ref
= OID_ARRAY_INIT
;
1951 if (args
->deepen
&& alternate_shallow_file
) {
1952 if (*alternate_shallow_file
== '\0') { /* --unshallow */
1953 unlink_or_warn(git_path_shallow(the_repository
));
1954 rollback_shallow_file(the_repository
, &shallow_lock
);
1956 commit_shallow_file(the_repository
, &shallow_lock
);
1957 alternate_shallow_file
= NULL
;
1961 if (!si
->shallow
|| !si
->shallow
->nr
)
1964 if (args
->cloning
) {
1966 * remote is shallow, but this is a clone, there are
1967 * no objects in repo to worry about. Accept any
1968 * shallow points that exist in the pack (iow in repo
1969 * after get_pack() and reprepare_packed_git())
1971 struct oid_array extra
= OID_ARRAY_INIT
;
1972 struct object_id
*oid
= si
->shallow
->oid
;
1973 for (i
= 0; i
< si
->shallow
->nr
; i
++)
1974 if (repo_has_object_file(the_repository
, &oid
[i
]))
1975 oid_array_append(&extra
, &oid
[i
]);
1977 setup_alternate_shallow(&shallow_lock
,
1978 &alternate_shallow_file
,
1980 commit_shallow_file(the_repository
, &shallow_lock
);
1981 alternate_shallow_file
= NULL
;
1983 oid_array_clear(&extra
);
1987 if (!si
->nr_ours
&& !si
->nr_theirs
)
1990 remove_nonexistent_theirs_shallow(si
);
1991 if (!si
->nr_ours
&& !si
->nr_theirs
)
1993 for (i
= 0; i
< nr_sought
; i
++)
1994 oid_array_append(&ref
, &sought
[i
]->old_oid
);
1997 if (args
->update_shallow
) {
1999 * remote is also shallow, .git/shallow may be updated
2000 * so all refs can be accepted. Make sure we only add
2001 * shallow roots that are actually reachable from new
2004 struct oid_array extra
= OID_ARRAY_INIT
;
2005 struct object_id
*oid
= si
->shallow
->oid
;
2006 assign_shallow_commits_to_refs(si
, NULL
, NULL
);
2007 if (!si
->nr_ours
&& !si
->nr_theirs
) {
2008 oid_array_clear(&ref
);
2011 for (i
= 0; i
< si
->nr_ours
; i
++)
2012 oid_array_append(&extra
, &oid
[si
->ours
[i
]]);
2013 for (i
= 0; i
< si
->nr_theirs
; i
++)
2014 oid_array_append(&extra
, &oid
[si
->theirs
[i
]]);
2015 setup_alternate_shallow(&shallow_lock
,
2016 &alternate_shallow_file
,
2018 commit_shallow_file(the_repository
, &shallow_lock
);
2019 oid_array_clear(&extra
);
2020 oid_array_clear(&ref
);
2021 alternate_shallow_file
= NULL
;
2026 * remote is also shallow, check what ref is safe to update
2027 * without updating .git/shallow
2029 CALLOC_ARRAY(status
, nr_sought
);
2030 assign_shallow_commits_to_refs(si
, NULL
, status
);
2031 if (si
->nr_ours
|| si
->nr_theirs
) {
2032 for (i
= 0; i
< nr_sought
; i
++)
2034 sought
[i
]->status
= REF_STATUS_REJECT_SHALLOW
;
2037 oid_array_clear(&ref
);
2040 static const struct object_id
*iterate_ref_map(void *cb_data
)
2042 struct ref
**rm
= cb_data
;
2043 struct ref
*ref
= *rm
;
2048 return &ref
->old_oid
;
2051 struct ref
*fetch_pack(struct fetch_pack_args
*args
,
2053 const struct ref
*ref
,
2054 struct ref
**sought
, int nr_sought
,
2055 struct oid_array
*shallow
,
2056 struct string_list
*pack_lockfiles
,
2057 enum protocol_version version
)
2059 struct ref
*ref_cpy
;
2060 struct shallow_info si
;
2061 struct oid_array shallows_scratch
= OID_ARRAY_INIT
;
2065 nr_sought
= remove_duplicates_in_refs(sought
, nr_sought
);
2067 if (version
!= protocol_v2
&& !ref
) {
2068 packet_flush(fd
[1]);
2069 die(_("no matching remote head"));
2071 if (version
== protocol_v2
) {
2073 BUG("Protocol V2 does not provide shallows at this point in the fetch");
2074 memset(&si
, 0, sizeof(si
));
2075 ref_cpy
= do_fetch_pack_v2(args
, fd
, ref
, sought
, nr_sought
,
2076 &shallows_scratch
, &si
,
2079 prepare_shallow_info(&si
, shallow
);
2080 ref_cpy
= do_fetch_pack(args
, fd
, ref
, sought
, nr_sought
,
2081 &si
, pack_lockfiles
);
2083 reprepare_packed_git(the_repository
);
2085 if (!args
->cloning
&& args
->deepen
) {
2086 struct check_connected_options opt
= CHECK_CONNECTED_INIT
;
2087 struct ref
*iterator
= ref_cpy
;
2088 opt
.shallow_file
= alternate_shallow_file
;
2090 opt
.is_deepening_fetch
= 1;
2091 if (check_connected(iterate_ref_map
, &iterator
, &opt
)) {
2092 error(_("remote did not send all necessary objects"));
2095 rollback_shallow_file(the_repository
, &shallow_lock
);
2098 args
->connectivity_checked
= 1;
2101 update_shallow(args
, sought
, nr_sought
, &si
);
2103 clear_shallow_info(&si
);
2104 oid_array_clear(&shallows_scratch
);
2108 static int add_to_object_array(const struct object_id
*oid
, void *data
)
2110 struct object_array
*a
= data
;
2112 add_object_array(lookup_object(the_repository
, oid
), "", a
);
2116 static void clear_common_flag(struct oidset
*s
)
2118 struct oidset_iter iter
;
2119 const struct object_id
*oid
;
2120 oidset_iter_init(s
, &iter
);
2122 while ((oid
= oidset_iter_next(&iter
))) {
2123 struct object
*obj
= lookup_object(the_repository
, oid
);
2124 obj
->flags
&= ~COMMON
;
2128 void negotiate_using_fetch(const struct oid_array
*negotiation_tips
,
2129 const struct string_list
*server_options
,
2132 struct oidset
*acked_commits
)
2134 struct fetch_negotiator negotiator
;
2135 struct packet_reader reader
;
2136 struct object_array nt_object_array
= OBJECT_ARRAY_INIT
;
2137 struct strbuf req_buf
= STRBUF_INIT
;
2138 int haves_to_send
= INITIAL_FLUSH
;
2141 int last_iteration
= 0;
2142 int negotiation_round
= 0;
2143 timestamp_t min_generation
= GENERATION_NUMBER_INFINITY
;
2145 fetch_negotiator_init(the_repository
, &negotiator
);
2146 mark_tips(&negotiator
, negotiation_tips
);
2148 packet_reader_init(&reader
, fd
[0], NULL
, 0,
2149 PACKET_READ_CHOMP_NEWLINE
|
2150 PACKET_READ_DIE_ON_ERR_PACKET
);
2152 oid_array_for_each((struct oid_array
*) negotiation_tips
,
2153 add_to_object_array
,
2156 trace2_region_enter("fetch-pack", "negotiate_using_fetch", the_repository
);
2157 while (!last_iteration
) {
2159 struct object_id common_oid
;
2160 int received_ready
= 0;
2162 negotiation_round
++;
2164 trace2_region_enter_printf("negotiate_using_fetch", "round",
2165 the_repository
, "%d",
2167 strbuf_reset(&req_buf
);
2168 write_fetch_command_and_capabilities(&req_buf
, server_options
);
2170 packet_buf_write(&req_buf
, "wait-for-done");
2172 haves_added
= add_haves(&negotiator
, &req_buf
, &haves_to_send
);
2173 in_vain
+= haves_added
;
2174 if (!haves_added
|| (seen_ack
&& in_vain
>= MAX_IN_VAIN
))
2177 trace2_data_intmax("negotiate_using_fetch", the_repository
,
2178 "haves_added", haves_added
);
2179 trace2_data_intmax("negotiate_using_fetch", the_repository
,
2180 "in_vain", in_vain
);
2183 packet_buf_flush(&req_buf
);
2184 if (write_in_full(fd
[1], req_buf
.buf
, req_buf
.len
) < 0)
2185 die_errno(_("unable to write request to remote"));
2187 /* Process ACKs/NAKs */
2188 process_section_header(&reader
, "acknowledgments", 0);
2189 while (process_ack(&negotiator
, &reader
, &common_oid
,
2191 struct commit
*commit
= lookup_commit(the_repository
,
2194 timestamp_t generation
;
2196 parse_commit_or_die(commit
);
2197 commit
->object
.flags
|= COMMON
;
2198 generation
= commit_graph_generation(commit
);
2199 if (generation
< min_generation
)
2200 min_generation
= generation
;
2204 oidset_insert(acked_commits
, &common_oid
);
2207 die(_("unexpected 'ready' from remote"));
2209 do_check_stateless_delimiter(stateless_rpc
, &reader
);
2210 if (can_all_from_reach_with_flag(&nt_object_array
, COMMON
,
2214 trace2_region_leave_printf("negotiation", "round",
2215 the_repository
, "%d",
2218 trace2_region_enter("fetch-pack", "negotiate_using_fetch", the_repository
);
2219 trace2_data_intmax("negotiate_using_fetch", the_repository
,
2220 "total_rounds", negotiation_round
);
2221 clear_common_flag(acked_commits
);
2222 strbuf_release(&req_buf
);
2225 int report_unmatched_refs(struct ref
**sought
, int nr_sought
)
2229 for (i
= 0; i
< nr_sought
; i
++) {
2232 switch (sought
[i
]->match_status
) {
2235 case REF_NOT_MATCHED
:
2236 error(_("no such remote ref %s"), sought
[i
]->name
);
2238 case REF_UNADVERTISED_NOT_ALLOWED
:
2239 error(_("Server does not allow request for unadvertised object %s"),