3 #include "repository.h"
5 #include "environment.h"
16 #include "fetch-pack.h"
18 #include "run-command.h"
20 #include "transport.h"
22 #include "oid-array.h"
25 #include "object-store.h"
26 #include "connected.h"
27 #include "fetch-negotiator.h"
30 #include "commit-reach.h"
31 #include "commit-graph.h"
33 #include "mergesort.h"
36 static int transfer_unpack_limit
= -1;
37 static int fetch_unpack_limit
= -1;
38 static int unpack_limit
= 100;
39 static int prefer_ofs_delta
= 1;
41 static int deepen_since_ok
;
42 static int deepen_not_ok
;
43 static int fetch_fsck_objects
= -1;
44 static int transfer_fsck_objects
= -1;
45 static int agent_supported
;
46 static int server_supports_filtering
;
47 static int advertise_sid
;
48 static struct shallow_lock shallow_lock
;
49 static const char *alternate_shallow_file
;
50 static struct fsck_options fsck_options
= FSCK_OPTIONS_MISSING_GITMODULES
;
51 static struct strbuf fsck_msg_types
= STRBUF_INIT
;
52 static struct string_list uri_protocols
= STRING_LIST_INIT_DUP
;
54 /* Remember to update object flag allocation in object.h */
55 #define COMPLETE (1U << 0)
56 #define ALTERNATE (1U << 1)
57 #define COMMON (1U << 6)
58 #define REACH_SCRATCH (1U << 7)
61 * After sending this many "have"s if we do not get any new ACK , we
62 * give up traversing our history.
64 #define MAX_IN_VAIN 256
66 static int multi_ack
, use_sideband
;
67 /* Allow specifying sha1 if it is a ref tip. */
68 #define ALLOW_TIP_SHA1 01
69 /* Allow request of a sha1 if it is reachable from a ref (possibly hidden ref). */
70 #define ALLOW_REACHABLE_SHA1 02
71 static unsigned int allow_unadvertised_object_request
;
73 __attribute__((format (printf
, 2, 3)))
74 static inline void print_verbose(const struct fetch_pack_args
*args
,
82 va_start(params
, fmt
);
83 vfprintf(stderr
, fmt
, params
);
88 struct alternate_object_cache
{
89 struct object
**items
;
93 static void cache_one_alternate(const struct object_id
*oid
,
96 struct alternate_object_cache
*cache
= vcache
;
97 struct object
*obj
= parse_object(the_repository
, oid
);
99 if (!obj
|| (obj
->flags
& ALTERNATE
))
102 obj
->flags
|= ALTERNATE
;
103 ALLOC_GROW(cache
->items
, cache
->nr
+ 1, cache
->alloc
);
104 cache
->items
[cache
->nr
++] = obj
;
107 static void for_each_cached_alternate(struct fetch_negotiator
*negotiator
,
108 void (*cb
)(struct fetch_negotiator
*,
111 static int initialized
;
112 static struct alternate_object_cache cache
;
116 for_each_alternate_ref(cache_one_alternate
, &cache
);
120 for (i
= 0; i
< cache
.nr
; i
++)
121 cb(negotiator
, cache
.items
[i
]);
124 static struct commit
*deref_without_lazy_fetch_extended(const struct object_id
*oid
,
125 int mark_tags_complete
,
126 enum object_type
*type
,
127 unsigned int oi_flags
)
129 struct object_info info
= { .typep
= type
};
130 struct commit
*commit
;
132 commit
= lookup_commit_in_graph(the_repository
, oid
);
137 if (oid_object_info_extended(the_repository
, oid
, &info
,
140 if (*type
== OBJ_TAG
) {
141 struct tag
*tag
= (struct tag
*)
142 parse_object(the_repository
, oid
);
146 if (mark_tags_complete
)
147 tag
->object
.flags
|= COMPLETE
;
148 oid
= &tag
->tagged
->oid
;
154 if (*type
== OBJ_COMMIT
) {
155 struct commit
*commit
= lookup_commit(the_repository
, oid
);
156 if (!commit
|| repo_parse_commit(the_repository
, commit
))
165 static struct commit
*deref_without_lazy_fetch(const struct object_id
*oid
,
166 int mark_tags_complete
)
168 enum object_type type
;
169 unsigned flags
= OBJECT_INFO_SKIP_FETCH_OBJECT
| OBJECT_INFO_QUICK
;
170 return deref_without_lazy_fetch_extended(oid
, mark_tags_complete
,
174 static int rev_list_insert_ref(struct fetch_negotiator
*negotiator
,
175 const struct object_id
*oid
)
177 struct commit
*c
= deref_without_lazy_fetch(oid
, 0);
180 negotiator
->add_tip(negotiator
, c
);
184 static int rev_list_insert_ref_oid(const char *refname UNUSED
,
185 const struct object_id
*oid
,
189 return rev_list_insert_ref(cb_data
, oid
);
200 static void consume_shallow_list(struct fetch_pack_args
*args
,
201 struct packet_reader
*reader
)
203 if (args
->stateless_rpc
&& args
->deepen
) {
204 /* If we sent a depth we will get back "duplicate"
205 * shallow and unshallow commands every time there
206 * is a block of have lines exchanged.
208 while (packet_reader_read(reader
) == PACKET_READ_NORMAL
) {
209 if (starts_with(reader
->line
, "shallow "))
211 if (starts_with(reader
->line
, "unshallow "))
213 die(_("git fetch-pack: expected shallow list"));
215 if (reader
->status
!= PACKET_READ_FLUSH
)
216 die(_("git fetch-pack: expected a flush packet after shallow list"));
220 static enum ack_type
get_ack(struct packet_reader
*reader
,
221 struct object_id
*result_oid
)
226 if (packet_reader_read(reader
) != PACKET_READ_NORMAL
)
227 die(_("git fetch-pack: expected ACK/NAK, got a flush packet"));
228 len
= reader
->pktlen
;
230 if (!strcmp(reader
->line
, "NAK"))
232 if (skip_prefix(reader
->line
, "ACK ", &arg
)) {
234 if (!parse_oid_hex(arg
, result_oid
, &p
)) {
235 len
-= p
- reader
->line
;
238 if (strstr(p
, "continue"))
240 if (strstr(p
, "common"))
242 if (strstr(p
, "ready"))
247 die(_("git fetch-pack: expected ACK/NAK, got '%s'"), reader
->line
);
250 static void send_request(struct fetch_pack_args
*args
,
251 int fd
, struct strbuf
*buf
)
253 if (args
->stateless_rpc
) {
254 send_sideband(fd
, -1, buf
->buf
, buf
->len
, LARGE_PACKET_MAX
);
257 if (write_in_full(fd
, buf
->buf
, buf
->len
) < 0)
258 die_errno(_("unable to write to remote"));
262 static void insert_one_alternate_object(struct fetch_negotiator
*negotiator
,
265 rev_list_insert_ref(negotiator
, &obj
->oid
);
268 #define INITIAL_FLUSH 16
269 #define PIPESAFE_FLUSH 32
270 #define LARGE_FLUSH 16384
272 static int next_flush(int stateless_rpc
, int count
)
275 if (count
< LARGE_FLUSH
)
278 count
= count
* 11 / 10;
280 if (count
< PIPESAFE_FLUSH
)
283 count
+= PIPESAFE_FLUSH
;
288 static void mark_tips(struct fetch_negotiator
*negotiator
,
289 const struct oid_array
*negotiation_tips
)
293 if (!negotiation_tips
) {
294 for_each_rawref(rev_list_insert_ref_oid
, negotiator
);
298 for (i
= 0; i
< negotiation_tips
->nr
; i
++)
299 rev_list_insert_ref(negotiator
, &negotiation_tips
->oid
[i
]);
303 static void send_filter(struct fetch_pack_args
*args
,
304 struct strbuf
*req_buf
,
305 int server_supports_filter
)
307 if (args
->filter_options
.choice
) {
309 expand_list_objects_filter_spec(&args
->filter_options
);
310 if (server_supports_filter
) {
311 print_verbose(args
, _("Server supports filter"));
312 packet_buf_write(req_buf
, "filter %s", spec
);
313 trace2_data_string("fetch", the_repository
,
314 "filter/effective", spec
);
316 warning("filtering not recognized by server, ignoring");
317 trace2_data_string("fetch", the_repository
,
318 "filter/unsupported", spec
);
321 trace2_data_string("fetch", the_repository
,
326 static int find_common(struct fetch_negotiator
*negotiator
,
327 struct fetch_pack_args
*args
,
328 int fd
[2], struct object_id
*result_oid
,
332 int count
= 0, flushes
= 0, flush_at
= INITIAL_FLUSH
, retval
;
333 int negotiation_round
= 0, haves
= 0;
334 const struct object_id
*oid
;
335 unsigned in_vain
= 0;
336 int got_continue
= 0;
338 struct strbuf req_buf
= STRBUF_INIT
;
339 size_t state_len
= 0;
340 struct packet_reader reader
;
342 if (args
->stateless_rpc
&& multi_ack
== 1)
343 die(_("the option '%s' requires '%s'"), "--stateless-rpc", "multi_ack_detailed");
345 packet_reader_init(&reader
, fd
[0], NULL
, 0,
346 PACKET_READ_CHOMP_NEWLINE
|
347 PACKET_READ_DIE_ON_ERR_PACKET
);
349 mark_tips(negotiator
, args
->negotiation_tips
);
350 for_each_cached_alternate(negotiator
, insert_one_alternate_object
);
353 for ( ; refs
; refs
= refs
->next
) {
354 struct object_id
*remote
= &refs
->old_oid
;
355 const char *remote_hex
;
358 if (!args
->refetch
) {
360 * If that object is complete (i.e. it is an ancestor of a
361 * local ref), we tell them we have it but do not have to
362 * tell them about its ancestors, which they already know
365 * We use lookup_object here because we are only
366 * interested in the case we *know* the object is
367 * reachable and we have already scanned it.
369 if (((o
= lookup_object(the_repository
, remote
)) != NULL
) &&
370 (o
->flags
& COMPLETE
)) {
375 remote_hex
= oid_to_hex(remote
);
377 struct strbuf c
= STRBUF_INIT
;
378 if (multi_ack
== 2) strbuf_addstr(&c
, " multi_ack_detailed");
379 if (multi_ack
== 1) strbuf_addstr(&c
, " multi_ack");
380 if (no_done
) strbuf_addstr(&c
, " no-done");
381 if (use_sideband
== 2) strbuf_addstr(&c
, " side-band-64k");
382 if (use_sideband
== 1) strbuf_addstr(&c
, " side-band");
383 if (args
->deepen_relative
) strbuf_addstr(&c
, " deepen-relative");
384 if (args
->use_thin_pack
) strbuf_addstr(&c
, " thin-pack");
385 if (args
->no_progress
) strbuf_addstr(&c
, " no-progress");
386 if (args
->include_tag
) strbuf_addstr(&c
, " include-tag");
387 if (prefer_ofs_delta
) strbuf_addstr(&c
, " ofs-delta");
388 if (deepen_since_ok
) strbuf_addstr(&c
, " deepen-since");
389 if (deepen_not_ok
) strbuf_addstr(&c
, " deepen-not");
390 if (agent_supported
) strbuf_addf(&c
, " agent=%s",
391 git_user_agent_sanitized());
393 strbuf_addf(&c
, " session-id=%s", trace2_session_id());
394 if (args
->filter_options
.choice
)
395 strbuf_addstr(&c
, " filter");
396 packet_buf_write(&req_buf
, "want %s%s\n", remote_hex
, c
.buf
);
399 packet_buf_write(&req_buf
, "want %s\n", remote_hex
);
404 strbuf_release(&req_buf
);
409 if (is_repository_shallow(the_repository
))
410 write_shallow_commits(&req_buf
, 1, NULL
);
412 packet_buf_write(&req_buf
, "deepen %d", args
->depth
);
413 if (args
->deepen_since
) {
414 timestamp_t max_age
= approxidate(args
->deepen_since
);
415 packet_buf_write(&req_buf
, "deepen-since %"PRItime
, max_age
);
417 if (args
->deepen_not
) {
419 for (i
= 0; i
< args
->deepen_not
->nr
; i
++) {
420 struct string_list_item
*s
= args
->deepen_not
->items
+ i
;
421 packet_buf_write(&req_buf
, "deepen-not %s", s
->string
);
424 send_filter(args
, &req_buf
, server_supports_filtering
);
425 packet_buf_flush(&req_buf
);
426 state_len
= req_buf
.len
;
430 struct object_id oid
;
432 send_request(args
, fd
[1], &req_buf
);
433 while (packet_reader_read(&reader
) == PACKET_READ_NORMAL
) {
434 if (skip_prefix(reader
.line
, "shallow ", &arg
)) {
435 if (get_oid_hex(arg
, &oid
))
436 die(_("invalid shallow line: %s"), reader
.line
);
437 register_shallow(the_repository
, &oid
);
440 if (skip_prefix(reader
.line
, "unshallow ", &arg
)) {
441 if (get_oid_hex(arg
, &oid
))
442 die(_("invalid unshallow line: %s"), reader
.line
);
443 if (!lookup_object(the_repository
, &oid
))
444 die(_("object not found: %s"), reader
.line
);
445 /* make sure that it is parsed as shallow */
446 if (!parse_object(the_repository
, &oid
))
447 die(_("error in object: %s"), reader
.line
);
448 if (unregister_shallow(&oid
))
449 die(_("no shallow found: %s"), reader
.line
);
452 die(_("expected shallow/unshallow, got %s"), reader
.line
);
454 } else if (!args
->stateless_rpc
)
455 send_request(args
, fd
[1], &req_buf
);
457 if (!args
->stateless_rpc
) {
458 /* If we aren't using the stateless-rpc interface
459 * we don't need to retain the headers.
461 strbuf_setlen(&req_buf
, 0);
465 trace2_region_enter("fetch-pack", "negotiation_v0_v1", the_repository
);
468 while ((oid
= negotiator
->next(negotiator
))) {
469 packet_buf_write(&req_buf
, "have %s\n", oid_to_hex(oid
));
470 print_verbose(args
, "have %s", oid_to_hex(oid
));
473 if (flush_at
<= ++count
) {
477 trace2_region_enter_printf("negotiation_v0_v1", "round",
478 the_repository
, "%d",
480 trace2_data_intmax("negotiation_v0_v1", the_repository
,
481 "haves_added", haves
);
482 trace2_data_intmax("negotiation_v0_v1", the_repository
,
485 packet_buf_flush(&req_buf
);
486 send_request(args
, fd
[1], &req_buf
);
487 strbuf_setlen(&req_buf
, state_len
);
489 flush_at
= next_flush(args
->stateless_rpc
, count
);
492 * We keep one window "ahead" of the other side, and
493 * will wait for an ACK only on the next one
495 if (!args
->stateless_rpc
&& count
== INITIAL_FLUSH
)
498 consume_shallow_list(args
, &reader
);
500 ack
= get_ack(&reader
, result_oid
);
502 print_verbose(args
, _("got %s %d %s"), "ack",
503 ack
, oid_to_hex(result_oid
));
506 trace2_region_leave_printf("negotiation_v0_v1", "round",
507 the_repository
, "%d",
516 struct commit
*commit
=
517 lookup_commit(the_repository
,
522 die(_("invalid commit %s"), oid_to_hex(result_oid
));
523 was_common
= negotiator
->ack(negotiator
, commit
);
524 if (args
->stateless_rpc
527 /* We need to replay the have for this object
528 * on the next RPC request so the peer knows
529 * it is in common with us.
531 const char *hex
= oid_to_hex(result_oid
);
532 packet_buf_write(&req_buf
, "have %s\n", hex
);
533 state_len
= req_buf
.len
;
536 * Reset in_vain because an ack
537 * for this commit has not been
541 } else if (!args
->stateless_rpc
542 || ack
!= ACK_common
)
546 if (ack
== ACK_ready
)
553 trace2_region_leave_printf("negotiation_v0_v1", "round",
554 the_repository
, "%d",
556 if (got_continue
&& MAX_IN_VAIN
< in_vain
) {
557 print_verbose(args
, _("giving up"));
565 trace2_region_leave("fetch-pack", "negotiation_v0_v1", the_repository
);
566 trace2_data_intmax("negotiation_v0_v1", the_repository
, "total_rounds",
568 if (!got_ready
|| !no_done
) {
569 packet_buf_write(&req_buf
, "done\n");
570 send_request(args
, fd
[1], &req_buf
);
572 print_verbose(args
, _("done"));
577 strbuf_release(&req_buf
);
579 if (!got_ready
|| !no_done
)
580 consume_shallow_list(args
, &reader
);
581 while (flushes
|| multi_ack
) {
582 int ack
= get_ack(&reader
, result_oid
);
584 print_verbose(args
, _("got %s (%d) %s"), "ack",
585 ack
, oid_to_hex(result_oid
));
593 /* it is no error to fetch into a completely empty repo */
594 return count
? retval
: 0;
597 static struct commit_list
*complete
;
599 static int mark_complete(const struct object_id
*oid
)
601 struct commit
*commit
= deref_without_lazy_fetch(oid
, 1);
603 if (commit
&& !(commit
->object
.flags
& COMPLETE
)) {
604 commit
->object
.flags
|= COMPLETE
;
605 commit_list_insert(commit
, &complete
);
610 static int mark_complete_oid(const char *refname UNUSED
,
611 const struct object_id
*oid
,
613 void *cb_data UNUSED
)
615 return mark_complete(oid
);
618 static void mark_recent_complete_commits(struct fetch_pack_args
*args
,
621 while (complete
&& cutoff
<= complete
->item
->date
) {
622 print_verbose(args
, _("Marking %s as complete"),
623 oid_to_hex(&complete
->item
->object
.oid
));
624 pop_most_recent_commit(&complete
, COMPLETE
);
628 static void add_refs_to_oidset(struct oidset
*oids
, struct ref
*refs
)
630 for (; refs
; refs
= refs
->next
)
631 oidset_insert(oids
, &refs
->old_oid
);
634 static int is_unmatched_ref(const struct ref
*ref
)
636 struct object_id oid
;
638 return ref
->match_status
== REF_NOT_MATCHED
&&
639 !parse_oid_hex(ref
->name
, &oid
, &p
) &&
641 oideq(&oid
, &ref
->old_oid
);
644 static void filter_refs(struct fetch_pack_args
*args
,
646 struct ref
**sought
, int nr_sought
)
648 struct ref
*newlist
= NULL
;
649 struct ref
**newtail
= &newlist
;
650 struct ref
*unmatched
= NULL
;
651 struct ref
*ref
, *next
;
652 struct oidset tip_oids
= OIDSET_INIT
;
654 int strict
= !(allow_unadvertised_object_request
&
655 (ALLOW_TIP_SHA1
| ALLOW_REACHABLE_SHA1
));
658 for (ref
= *refs
; ref
; ref
= next
) {
662 if (starts_with(ref
->name
, "refs/") &&
663 check_refname_format(ref
->name
, 0)) {
665 * trash or a peeled value; do not even add it to
671 while (i
< nr_sought
) {
672 int cmp
= strcmp(ref
->name
, sought
[i
]->name
);
674 break; /* definitely do not have it */
676 keep
= 1; /* definitely have it */
677 sought
[i
]->match_status
= REF_MATCHED
;
682 if (!keep
&& args
->fetch_all
&&
683 (!args
->deepen
|| !starts_with(ref
->name
, "refs/tags/")))
690 newtail
= &ref
->next
;
692 ref
->next
= unmatched
;
698 for (i
= 0; i
< nr_sought
; i
++) {
700 if (!is_unmatched_ref(ref
))
703 add_refs_to_oidset(&tip_oids
, unmatched
);
704 add_refs_to_oidset(&tip_oids
, newlist
);
709 /* Append unmatched requests to the list */
710 for (i
= 0; i
< nr_sought
; i
++) {
712 if (!is_unmatched_ref(ref
))
715 if (!strict
|| oidset_contains(&tip_oids
, &ref
->old_oid
)) {
716 ref
->match_status
= REF_MATCHED
;
717 *newtail
= copy_ref(ref
);
718 newtail
= &(*newtail
)->next
;
720 ref
->match_status
= REF_UNADVERTISED_NOT_ALLOWED
;
724 oidset_clear(&tip_oids
);
725 free_refs(unmatched
);
730 static void mark_alternate_complete(struct fetch_negotiator
*negotiator UNUSED
,
733 mark_complete(&obj
->oid
);
736 struct loose_object_iter
{
737 struct oidset
*loose_object_set
;
742 * Mark recent commits available locally and reachable from a local ref as
745 * The cutoff time for recency is determined by this heuristic: it is the
746 * earliest commit time of the objects in refs that are commits and that we know
747 * the commit time of.
749 static void mark_complete_and_common_ref(struct fetch_negotiator
*negotiator
,
750 struct fetch_pack_args
*args
,
754 int old_save_commit_buffer
= save_commit_buffer
;
755 timestamp_t cutoff
= 0;
760 save_commit_buffer
= 0;
762 trace2_region_enter("fetch-pack", "parse_remote_refs_and_find_cutoff", NULL
);
763 for (ref
= *refs
; ref
; ref
= ref
->next
) {
764 struct commit
*commit
;
766 commit
= lookup_commit_in_graph(the_repository
, &ref
->old_oid
);
770 if (!repo_has_object_file_with_flags(the_repository
, &ref
->old_oid
,
772 OBJECT_INFO_SKIP_FETCH_OBJECT
))
774 o
= parse_object(the_repository
, &ref
->old_oid
);
775 if (!o
|| o
->type
!= OBJ_COMMIT
)
778 commit
= (struct commit
*)o
;
782 * We already have it -- which may mean that we were
783 * in sync with the other side at some time after
784 * that (it is OK if we guess wrong here).
786 if (!cutoff
|| cutoff
< commit
->date
)
787 cutoff
= commit
->date
;
789 trace2_region_leave("fetch-pack", "parse_remote_refs_and_find_cutoff", NULL
);
792 * This block marks all local refs as COMPLETE, and then recursively marks all
793 * parents of those refs as COMPLETE.
795 trace2_region_enter("fetch-pack", "mark_complete_local_refs", NULL
);
797 for_each_rawref(mark_complete_oid
, NULL
);
798 for_each_cached_alternate(NULL
, mark_alternate_complete
);
799 commit_list_sort_by_date(&complete
);
801 mark_recent_complete_commits(args
, cutoff
);
803 trace2_region_leave("fetch-pack", "mark_complete_local_refs", NULL
);
806 * Mark all complete remote refs as common refs.
807 * Don't mark them common yet; the server has to be told so first.
809 trace2_region_enter("fetch-pack", "mark_common_remote_refs", NULL
);
810 for (ref
= *refs
; ref
; ref
= ref
->next
) {
811 struct commit
*c
= deref_without_lazy_fetch(&ref
->old_oid
, 0);
813 if (!c
|| !(c
->object
.flags
& COMPLETE
))
816 negotiator
->known_common(negotiator
, c
);
818 trace2_region_leave("fetch-pack", "mark_common_remote_refs", NULL
);
820 save_commit_buffer
= old_save_commit_buffer
;
824 * Returns 1 if every object pointed to by the given remote refs is available
825 * locally and reachable from a local ref, and 0 otherwise.
827 static int everything_local(struct fetch_pack_args
*args
,
833 for (retval
= 1, ref
= *refs
; ref
; ref
= ref
->next
) {
834 const struct object_id
*remote
= &ref
->old_oid
;
837 o
= lookup_object(the_repository
, remote
);
838 if (!o
|| !(o
->flags
& COMPLETE
)) {
840 print_verbose(args
, "want %s (%s)", oid_to_hex(remote
),
844 print_verbose(args
, _("already have %s (%s)"), oid_to_hex(remote
),
851 static int sideband_demux(int in UNUSED
, int out
, void *data
)
856 ret
= recv_sideband("fetch-pack", xd
[0], out
);
861 static void create_promisor_file(const char *keep_name
,
862 struct ref
**sought
, int nr_sought
)
864 struct strbuf promisor_name
= STRBUF_INIT
;
867 strbuf_addstr(&promisor_name
, keep_name
);
868 suffix_stripped
= strbuf_strip_suffix(&promisor_name
, ".keep");
869 if (!suffix_stripped
)
870 BUG("name of pack lockfile should end with .keep (was '%s')",
872 strbuf_addstr(&promisor_name
, ".promisor");
874 write_promisor_file(promisor_name
.buf
, sought
, nr_sought
);
876 strbuf_release(&promisor_name
);
879 static void parse_gitmodules_oids(int fd
, struct oidset
*gitmodules_oids
)
881 int len
= the_hash_algo
->hexsz
+ 1; /* hash + NL */
884 char hex_hash
[GIT_MAX_HEXSZ
+ 1];
885 int read_len
= read_in_full(fd
, hex_hash
, len
);
886 struct object_id oid
;
892 die("invalid length read %d", read_len
);
893 if (parse_oid_hex(hex_hash
, &oid
, &end
) || *end
!= '\n')
895 oidset_insert(gitmodules_oids
, &oid
);
899 static void add_index_pack_keep_option(struct strvec
*args
)
901 char hostname
[HOST_NAME_MAX
+ 1];
903 if (xgethostname(hostname
, sizeof(hostname
)))
904 xsnprintf(hostname
, sizeof(hostname
), "localhost");
905 strvec_pushf(args
, "--keep=fetch-pack %"PRIuMAX
" on %s",
906 (uintmax_t)getpid(), hostname
);
910 * If packfile URIs were provided, pass a non-NULL pointer to index_pack_args.
911 * The strings to pass as the --index-pack-arg arguments to http-fetch will be
912 * stored there. (It must be freed by the caller.)
914 static int get_pack(struct fetch_pack_args
*args
,
915 int xd
[2], struct string_list
*pack_lockfiles
,
916 struct strvec
*index_pack_args
,
917 struct ref
**sought
, int nr_sought
,
918 struct oidset
*gitmodules_oids
)
921 int do_keep
= args
->keep_pack
;
922 const char *cmd_name
;
923 struct pack_header header
;
925 struct child_process cmd
= CHILD_PROCESS_INIT
;
926 int fsck_objects
= 0;
929 memset(&demux
, 0, sizeof(demux
));
931 /* xd[] is talking with upload-pack; subprocess reads from
932 * xd[0], spits out band#2 to stderr, and feeds us band#1
933 * through demux->out.
935 demux
.proc
= sideband_demux
;
938 demux
.isolate_sigpipe
= 1;
939 if (start_async(&demux
))
940 die(_("fetch-pack: unable to fork off sideband demultiplexer"));
945 if (!args
->keep_pack
&& unpack_limit
&& !index_pack_args
) {
947 if (read_pack_header(demux
.out
, &header
))
948 die(_("protocol error: bad pack header"));
950 if (ntohl(header
.hdr_entries
) < unpack_limit
)
956 if (alternate_shallow_file
) {
957 strvec_push(&cmd
.args
, "--shallow-file");
958 strvec_push(&cmd
.args
, alternate_shallow_file
);
961 if (fetch_fsck_objects
>= 0
963 : transfer_fsck_objects
>= 0
964 ? transfer_fsck_objects
968 if (do_keep
|| args
->from_promisor
|| index_pack_args
|| fsck_objects
) {
969 if (pack_lockfiles
|| fsck_objects
)
971 cmd_name
= "index-pack";
972 strvec_push(&cmd
.args
, cmd_name
);
973 strvec_push(&cmd
.args
, "--stdin");
974 if (!args
->quiet
&& !args
->no_progress
)
975 strvec_push(&cmd
.args
, "-v");
976 if (args
->use_thin_pack
)
977 strvec_push(&cmd
.args
, "--fix-thin");
978 if ((do_keep
|| index_pack_args
) && (args
->lock_pack
|| unpack_limit
))
979 add_index_pack_keep_option(&cmd
.args
);
980 if (!index_pack_args
&& args
->check_self_contained_and_connected
)
981 strvec_push(&cmd
.args
, "--check-self-contained-and-connected");
984 * We cannot perform any connectivity checks because
985 * not all packs have been downloaded; let the caller
986 * have this responsibility.
988 args
->check_self_contained_and_connected
= 0;
990 if (args
->from_promisor
)
992 * create_promisor_file() may be called afterwards but
993 * we still need index-pack to know that this is a
994 * promisor pack. For example, if transfer.fsckobjects
995 * is true, index-pack needs to know that .gitmodules
996 * is a promisor object (so that it won't complain if
999 strvec_push(&cmd
.args
, "--promisor");
1002 cmd_name
= "unpack-objects";
1003 strvec_push(&cmd
.args
, cmd_name
);
1004 if (args
->quiet
|| args
->no_progress
)
1005 strvec_push(&cmd
.args
, "-q");
1006 args
->check_self_contained_and_connected
= 0;
1010 strvec_pushf(&cmd
.args
, "--pack_header=%"PRIu32
",%"PRIu32
,
1011 ntohl(header
.hdr_version
),
1012 ntohl(header
.hdr_entries
));
1014 if (args
->from_promisor
|| index_pack_args
)
1016 * We cannot use --strict in index-pack because it
1017 * checks both broken objects and links, but we only
1018 * want to check for broken objects.
1020 strvec_push(&cmd
.args
, "--fsck-objects");
1022 strvec_pushf(&cmd
.args
, "--strict%s",
1023 fsck_msg_types
.buf
);
1026 if (index_pack_args
) {
1029 for (i
= 0; i
< cmd
.args
.nr
; i
++)
1030 strvec_push(index_pack_args
, cmd
.args
.v
[i
]);
1033 sigchain_push(SIGPIPE
, SIG_IGN
);
1037 if (start_command(&cmd
))
1038 die(_("fetch-pack: unable to fork off %s"), cmd_name
);
1039 if (do_keep
&& (pack_lockfiles
|| fsck_objects
)) {
1041 char *pack_lockfile
= index_pack_lockfile(cmd
.out
, &is_well_formed
);
1043 if (!is_well_formed
)
1044 die(_("fetch-pack: invalid index-pack output"));
1046 string_list_append_nodup(pack_lockfiles
, pack_lockfile
);
1047 parse_gitmodules_oids(cmd
.out
, gitmodules_oids
);
1052 /* Closed by start_command() */
1055 ret
= finish_command(&cmd
);
1056 if (!ret
|| (args
->check_self_contained_and_connected
&& ret
== 1))
1057 args
->self_contained_and_connected
=
1058 args
->check_self_contained_and_connected
&&
1061 die(_("%s failed"), cmd_name
);
1062 if (use_sideband
&& finish_async(&demux
))
1063 die(_("error in sideband demultiplexer"));
1065 sigchain_pop(SIGPIPE
);
1068 * Now that index-pack has succeeded, write the promisor file using the
1069 * obtained .keep filename if necessary
1071 if (do_keep
&& pack_lockfiles
&& pack_lockfiles
->nr
&& args
->from_promisor
)
1072 create_promisor_file(pack_lockfiles
->items
[0].string
, sought
, nr_sought
);
1077 static int ref_compare_name(const struct ref
*a
, const struct ref
*b
)
1079 return strcmp(a
->name
, b
->name
);
1082 DEFINE_LIST_SORT(static, sort_ref_list
, struct ref
, next
);
1084 static int cmp_ref_by_name(const void *a_
, const void *b_
)
1086 const struct ref
*a
= *((const struct ref
**)a_
);
1087 const struct ref
*b
= *((const struct ref
**)b_
);
1088 return strcmp(a
->name
, b
->name
);
1091 static struct ref
*do_fetch_pack(struct fetch_pack_args
*args
,
1093 const struct ref
*orig_ref
,
1094 struct ref
**sought
, int nr_sought
,
1095 struct shallow_info
*si
,
1096 struct string_list
*pack_lockfiles
)
1098 struct repository
*r
= the_repository
;
1099 struct ref
*ref
= copy_ref_list(orig_ref
);
1100 struct object_id oid
;
1101 const char *agent_feature
;
1103 struct fetch_negotiator negotiator_alloc
;
1104 struct fetch_negotiator
*negotiator
;
1106 negotiator
= &negotiator_alloc
;
1107 if (args
->refetch
) {
1108 fetch_negotiator_init_noop(negotiator
);
1110 fetch_negotiator_init(r
, negotiator
);
1113 sort_ref_list(&ref
, ref_compare_name
);
1114 QSORT(sought
, nr_sought
, cmp_ref_by_name
);
1116 if ((agent_feature
= server_feature_value("agent", &agent_len
))) {
1117 agent_supported
= 1;
1119 print_verbose(args
, _("Server version is %.*s"),
1120 agent_len
, agent_feature
);
1123 if (!server_supports("session-id"))
1126 if (server_supports("shallow"))
1127 print_verbose(args
, _("Server supports %s"), "shallow");
1128 else if (args
->depth
> 0 || is_repository_shallow(r
))
1129 die(_("Server does not support shallow clients"));
1130 if (args
->depth
> 0 || args
->deepen_since
|| args
->deepen_not
)
1132 if (server_supports("multi_ack_detailed")) {
1133 print_verbose(args
, _("Server supports %s"), "multi_ack_detailed");
1135 if (server_supports("no-done")) {
1136 print_verbose(args
, _("Server supports %s"), "no-done");
1137 if (args
->stateless_rpc
)
1141 else if (server_supports("multi_ack")) {
1142 print_verbose(args
, _("Server supports %s"), "multi_ack");
1145 if (server_supports("side-band-64k")) {
1146 print_verbose(args
, _("Server supports %s"), "side-band-64k");
1149 else if (server_supports("side-band")) {
1150 print_verbose(args
, _("Server supports %s"), "side-band");
1153 if (server_supports("allow-tip-sha1-in-want")) {
1154 print_verbose(args
, _("Server supports %s"), "allow-tip-sha1-in-want");
1155 allow_unadvertised_object_request
|= ALLOW_TIP_SHA1
;
1157 if (server_supports("allow-reachable-sha1-in-want")) {
1158 print_verbose(args
, _("Server supports %s"), "allow-reachable-sha1-in-want");
1159 allow_unadvertised_object_request
|= ALLOW_REACHABLE_SHA1
;
1161 if (server_supports("thin-pack"))
1162 print_verbose(args
, _("Server supports %s"), "thin-pack");
1164 args
->use_thin_pack
= 0;
1165 if (server_supports("no-progress"))
1166 print_verbose(args
, _("Server supports %s"), "no-progress");
1168 args
->no_progress
= 0;
1169 if (server_supports("include-tag"))
1170 print_verbose(args
, _("Server supports %s"), "include-tag");
1172 args
->include_tag
= 0;
1173 if (server_supports("ofs-delta"))
1174 print_verbose(args
, _("Server supports %s"), "ofs-delta");
1176 prefer_ofs_delta
= 0;
1178 if (server_supports("filter")) {
1179 server_supports_filtering
= 1;
1180 print_verbose(args
, _("Server supports %s"), "filter");
1181 } else if (args
->filter_options
.choice
) {
1182 warning("filtering not recognized by server, ignoring");
1185 if (server_supports("deepen-since")) {
1186 print_verbose(args
, _("Server supports %s"), "deepen-since");
1187 deepen_since_ok
= 1;
1188 } else if (args
->deepen_since
)
1189 die(_("Server does not support --shallow-since"));
1190 if (server_supports("deepen-not")) {
1191 print_verbose(args
, _("Server supports %s"), "deepen-not");
1193 } else if (args
->deepen_not
)
1194 die(_("Server does not support --shallow-exclude"));
1195 if (server_supports("deepen-relative"))
1196 print_verbose(args
, _("Server supports %s"), "deepen-relative");
1197 else if (args
->deepen_relative
)
1198 die(_("Server does not support --deepen"));
1199 if (!server_supports_hash(the_hash_algo
->name
, NULL
))
1200 die(_("Server does not support this repository's object format"));
1202 mark_complete_and_common_ref(negotiator
, args
, &ref
);
1203 filter_refs(args
, &ref
, sought
, nr_sought
);
1204 if (!args
->refetch
&& everything_local(args
, &ref
)) {
1205 packet_flush(fd
[1]);
1208 if (find_common(negotiator
, args
, fd
, &oid
, ref
) < 0)
1209 if (!args
->keep_pack
)
1210 /* When cloning, it is not unusual to have
1213 warning(_("no common commits"));
1215 if (args
->stateless_rpc
)
1216 packet_flush(fd
[1]);
1218 setup_alternate_shallow(&shallow_lock
, &alternate_shallow_file
,
1220 else if (si
->nr_ours
|| si
->nr_theirs
) {
1221 if (args
->reject_shallow_remote
)
1222 die(_("source repository is shallow, reject to clone."));
1223 alternate_shallow_file
= setup_temporary_shallow(si
->shallow
);
1225 alternate_shallow_file
= NULL
;
1226 if (get_pack(args
, fd
, pack_lockfiles
, NULL
, sought
, nr_sought
,
1227 &fsck_options
.gitmodules_found
))
1228 die(_("git fetch-pack: fetch failed."));
1229 if (fsck_finish(&fsck_options
))
1234 negotiator
->release(negotiator
);
1238 static void add_shallow_requests(struct strbuf
*req_buf
,
1239 const struct fetch_pack_args
*args
)
1241 if (is_repository_shallow(the_repository
))
1242 write_shallow_commits(req_buf
, 1, NULL
);
1243 if (args
->depth
> 0)
1244 packet_buf_write(req_buf
, "deepen %d", args
->depth
);
1245 if (args
->deepen_since
) {
1246 timestamp_t max_age
= approxidate(args
->deepen_since
);
1247 packet_buf_write(req_buf
, "deepen-since %"PRItime
, max_age
);
1249 if (args
->deepen_not
) {
1251 for (i
= 0; i
< args
->deepen_not
->nr
; i
++) {
1252 struct string_list_item
*s
= args
->deepen_not
->items
+ i
;
1253 packet_buf_write(req_buf
, "deepen-not %s", s
->string
);
1256 if (args
->deepen_relative
)
1257 packet_buf_write(req_buf
, "deepen-relative\n");
1260 static void add_wants(const struct ref
*wants
, struct strbuf
*req_buf
)
1262 int use_ref_in_want
= server_supports_feature("fetch", "ref-in-want", 0);
1264 for ( ; wants
; wants
= wants
->next
) {
1265 const struct object_id
*remote
= &wants
->old_oid
;
1269 * If that object is complete (i.e. it is an ancestor of a
1270 * local ref), we tell them we have it but do not have to
1271 * tell them about its ancestors, which they already know
1274 * We use lookup_object here because we are only
1275 * interested in the case we *know* the object is
1276 * reachable and we have already scanned it.
1278 if (((o
= lookup_object(the_repository
, remote
)) != NULL
) &&
1279 (o
->flags
& COMPLETE
)) {
1283 if (!use_ref_in_want
|| wants
->exact_oid
)
1284 packet_buf_write(req_buf
, "want %s\n", oid_to_hex(remote
));
1286 packet_buf_write(req_buf
, "want-ref %s\n", wants
->name
);
1290 static void add_common(struct strbuf
*req_buf
, struct oidset
*common
)
1292 struct oidset_iter iter
;
1293 const struct object_id
*oid
;
1294 oidset_iter_init(common
, &iter
);
1296 while ((oid
= oidset_iter_next(&iter
))) {
1297 packet_buf_write(req_buf
, "have %s\n", oid_to_hex(oid
));
1301 static int add_haves(struct fetch_negotiator
*negotiator
,
1302 struct strbuf
*req_buf
,
1305 int haves_added
= 0;
1306 const struct object_id
*oid
;
1308 while ((oid
= negotiator
->next(negotiator
))) {
1309 packet_buf_write(req_buf
, "have %s\n", oid_to_hex(oid
));
1310 if (++haves_added
>= *haves_to_send
)
1314 /* Increase haves to send on next round */
1315 *haves_to_send
= next_flush(1, *haves_to_send
);
1320 static void write_fetch_command_and_capabilities(struct strbuf
*req_buf
,
1321 const struct string_list
*server_options
)
1323 const char *hash_name
;
1325 ensure_server_supports_v2("fetch");
1326 packet_buf_write(req_buf
, "command=fetch");
1327 if (server_supports_v2("agent"))
1328 packet_buf_write(req_buf
, "agent=%s", git_user_agent_sanitized());
1329 if (advertise_sid
&& server_supports_v2("session-id"))
1330 packet_buf_write(req_buf
, "session-id=%s", trace2_session_id());
1331 if (server_options
&& server_options
->nr
) {
1333 ensure_server_supports_v2("server-option");
1334 for (i
= 0; i
< server_options
->nr
; i
++)
1335 packet_buf_write(req_buf
, "server-option=%s",
1336 server_options
->items
[i
].string
);
1339 if (server_feature_v2("object-format", &hash_name
)) {
1340 int hash_algo
= hash_algo_by_name(hash_name
);
1341 if (hash_algo_by_ptr(the_hash_algo
) != hash_algo
)
1342 die(_("mismatched algorithms: client %s; server %s"),
1343 the_hash_algo
->name
, hash_name
);
1344 packet_buf_write(req_buf
, "object-format=%s", the_hash_algo
->name
);
1345 } else if (hash_algo_by_ptr(the_hash_algo
) != GIT_HASH_SHA1
) {
1346 die(_("the server does not support algorithm '%s'"),
1347 the_hash_algo
->name
);
1349 packet_buf_delim(req_buf
);
1352 static int send_fetch_request(struct fetch_negotiator
*negotiator
, int fd_out
,
1353 struct fetch_pack_args
*args
,
1354 const struct ref
*wants
, struct oidset
*common
,
1355 int *haves_to_send
, int *in_vain
,
1356 int sideband_all
, int seen_ack
)
1360 struct strbuf req_buf
= STRBUF_INIT
;
1362 write_fetch_command_and_capabilities(&req_buf
, args
->server_options
);
1364 if (args
->use_thin_pack
)
1365 packet_buf_write(&req_buf
, "thin-pack");
1366 if (args
->no_progress
)
1367 packet_buf_write(&req_buf
, "no-progress");
1368 if (args
->include_tag
)
1369 packet_buf_write(&req_buf
, "include-tag");
1370 if (prefer_ofs_delta
)
1371 packet_buf_write(&req_buf
, "ofs-delta");
1373 packet_buf_write(&req_buf
, "sideband-all");
1375 /* Add shallow-info and deepen request */
1376 if (server_supports_feature("fetch", "shallow", 0))
1377 add_shallow_requests(&req_buf
, args
);
1378 else if (is_repository_shallow(the_repository
) || args
->deepen
)
1379 die(_("Server does not support shallow requests"));
1382 send_filter(args
, &req_buf
,
1383 server_supports_feature("fetch", "filter", 0));
1385 if (server_supports_feature("fetch", "packfile-uris", 0)) {
1387 struct strbuf to_send
= STRBUF_INIT
;
1389 for (i
= 0; i
< uri_protocols
.nr
; i
++) {
1390 const char *s
= uri_protocols
.items
[i
].string
;
1392 if (!strcmp(s
, "https") || !strcmp(s
, "http")) {
1394 strbuf_addch(&to_send
, ',');
1395 strbuf_addstr(&to_send
, s
);
1399 packet_buf_write(&req_buf
, "packfile-uris %s",
1401 strbuf_release(&to_send
);
1406 add_wants(wants
, &req_buf
);
1408 /* Add all of the common commits we've found in previous rounds */
1409 add_common(&req_buf
, common
);
1411 haves_added
= add_haves(negotiator
, &req_buf
, haves_to_send
);
1412 *in_vain
+= haves_added
;
1413 trace2_data_intmax("negotiation_v2", the_repository
, "haves_added", haves_added
);
1414 trace2_data_intmax("negotiation_v2", the_repository
, "in_vain", *in_vain
);
1415 if (!haves_added
|| (seen_ack
&& *in_vain
>= MAX_IN_VAIN
)) {
1417 packet_buf_write(&req_buf
, "done\n");
1422 packet_buf_flush(&req_buf
);
1423 if (write_in_full(fd_out
, req_buf
.buf
, req_buf
.len
) < 0)
1424 die_errno(_("unable to write request to remote"));
1426 strbuf_release(&req_buf
);
1431 * Processes a section header in a server's response and checks if it matches
1432 * `section`. If the value of `peek` is 1, the header line will be peeked (and
1433 * not consumed); if 0, the line will be consumed and the function will die if
1434 * the section header doesn't match what was expected.
1436 static int process_section_header(struct packet_reader
*reader
,
1437 const char *section
, int peek
)
1441 if (packet_reader_peek(reader
) == PACKET_READ_NORMAL
&&
1442 !strcmp(reader
->line
, section
))
1448 die(_("expected '%s', received '%s'"),
1449 section
, reader
->line
);
1451 die(_("expected '%s'"), section
);
1453 packet_reader_read(reader
);
1459 static int process_ack(struct fetch_negotiator
*negotiator
,
1460 struct packet_reader
*reader
,
1461 struct object_id
*common_oid
,
1462 int *received_ready
)
1464 while (packet_reader_read(reader
) == PACKET_READ_NORMAL
) {
1467 if (!strcmp(reader
->line
, "NAK"))
1470 if (skip_prefix(reader
->line
, "ACK ", &arg
)) {
1471 if (!get_oid_hex(arg
, common_oid
)) {
1472 struct commit
*commit
;
1473 commit
= lookup_commit(the_repository
, common_oid
);
1475 negotiator
->ack(negotiator
, commit
);
1480 if (!strcmp(reader
->line
, "ready")) {
1481 *received_ready
= 1;
1485 die(_("unexpected acknowledgment line: '%s'"), reader
->line
);
1488 if (reader
->status
!= PACKET_READ_FLUSH
&&
1489 reader
->status
!= PACKET_READ_DELIM
)
1490 die(_("error processing acks: %d"), reader
->status
);
1493 * If an "acknowledgments" section is sent, a packfile is sent if and
1494 * only if "ready" was sent in this section. The other sections
1495 * ("shallow-info" and "wanted-refs") are sent only if a packfile is
1496 * sent. Therefore, a DELIM is expected if "ready" is sent, and a FLUSH
1499 if (*received_ready
&& reader
->status
!= PACKET_READ_DELIM
)
1501 * TRANSLATORS: The parameter will be 'ready', a protocol
1504 die(_("expected packfile to be sent after '%s'"), "ready");
1505 if (!*received_ready
&& reader
->status
!= PACKET_READ_FLUSH
)
1507 * TRANSLATORS: The parameter will be 'ready', a protocol
1510 die(_("expected no other sections to be sent after no '%s'"), "ready");
1515 static void receive_shallow_info(struct fetch_pack_args
*args
,
1516 struct packet_reader
*reader
,
1517 struct oid_array
*shallows
,
1518 struct shallow_info
*si
)
1520 int unshallow_received
= 0;
1522 process_section_header(reader
, "shallow-info", 0);
1523 while (packet_reader_read(reader
) == PACKET_READ_NORMAL
) {
1525 struct object_id oid
;
1527 if (skip_prefix(reader
->line
, "shallow ", &arg
)) {
1528 if (get_oid_hex(arg
, &oid
))
1529 die(_("invalid shallow line: %s"), reader
->line
);
1530 oid_array_append(shallows
, &oid
);
1533 if (skip_prefix(reader
->line
, "unshallow ", &arg
)) {
1534 if (get_oid_hex(arg
, &oid
))
1535 die(_("invalid unshallow line: %s"), reader
->line
);
1536 if (!lookup_object(the_repository
, &oid
))
1537 die(_("object not found: %s"), reader
->line
);
1538 /* make sure that it is parsed as shallow */
1539 if (!parse_object(the_repository
, &oid
))
1540 die(_("error in object: %s"), reader
->line
);
1541 if (unregister_shallow(&oid
))
1542 die(_("no shallow found: %s"), reader
->line
);
1543 unshallow_received
= 1;
1546 die(_("expected shallow/unshallow, got %s"), reader
->line
);
1549 if (reader
->status
!= PACKET_READ_FLUSH
&&
1550 reader
->status
!= PACKET_READ_DELIM
)
1551 die(_("error processing shallow info: %d"), reader
->status
);
1553 if (args
->deepen
|| unshallow_received
) {
1555 * Treat these as shallow lines caused by our depth settings.
1556 * In v0, these lines cannot cause refs to be rejected; do the
1561 for (i
= 0; i
< shallows
->nr
; i
++)
1562 register_shallow(the_repository
, &shallows
->oid
[i
]);
1563 setup_alternate_shallow(&shallow_lock
, &alternate_shallow_file
,
1566 } else if (shallows
->nr
) {
1568 * Treat these as shallow lines caused by the remote being
1569 * shallow. In v0, remote refs that reach these objects are
1570 * rejected (unless --update-shallow is set); do the same.
1572 prepare_shallow_info(si
, shallows
);
1573 if (si
->nr_ours
|| si
->nr_theirs
) {
1574 if (args
->reject_shallow_remote
)
1575 die(_("source repository is shallow, reject to clone."));
1576 alternate_shallow_file
=
1577 setup_temporary_shallow(si
->shallow
);
1579 alternate_shallow_file
= NULL
;
1581 alternate_shallow_file
= NULL
;
1585 static int cmp_name_ref(const void *name
, const void *ref
)
1587 return strcmp(name
, (*(struct ref
**)ref
)->name
);
1590 static void receive_wanted_refs(struct packet_reader
*reader
,
1591 struct ref
**sought
, int nr_sought
)
1593 process_section_header(reader
, "wanted-refs", 0);
1594 while (packet_reader_read(reader
) == PACKET_READ_NORMAL
) {
1595 struct object_id oid
;
1599 if (parse_oid_hex(reader
->line
, &oid
, &end
) || *end
++ != ' ')
1600 die(_("expected wanted-ref, got '%s'"), reader
->line
);
1602 found
= bsearch(end
, sought
, nr_sought
, sizeof(*sought
),
1605 die(_("unexpected wanted-ref: '%s'"), reader
->line
);
1606 oidcpy(&(*found
)->old_oid
, &oid
);
1609 if (reader
->status
!= PACKET_READ_DELIM
)
1610 die(_("error processing wanted refs: %d"), reader
->status
);
1613 static void receive_packfile_uris(struct packet_reader
*reader
,
1614 struct string_list
*uris
)
1616 process_section_header(reader
, "packfile-uris", 0);
1617 while (packet_reader_read(reader
) == PACKET_READ_NORMAL
) {
1618 if (reader
->pktlen
< the_hash_algo
->hexsz
||
1619 reader
->line
[the_hash_algo
->hexsz
] != ' ')
1620 die("expected '<hash> <uri>', got: %s\n", reader
->line
);
1622 string_list_append(uris
, reader
->line
);
1624 if (reader
->status
!= PACKET_READ_DELIM
)
1625 die("expected DELIM");
1629 FETCH_CHECK_LOCAL
= 0,
1636 static void do_check_stateless_delimiter(int stateless_rpc
,
1637 struct packet_reader
*reader
)
1639 check_stateless_delimiter(stateless_rpc
, reader
,
1640 _("git fetch-pack: expected response end packet"));
1643 static struct ref
*do_fetch_pack_v2(struct fetch_pack_args
*args
,
1645 const struct ref
*orig_ref
,
1646 struct ref
**sought
, int nr_sought
,
1647 struct oid_array
*shallows
,
1648 struct shallow_info
*si
,
1649 struct string_list
*pack_lockfiles
)
1651 struct repository
*r
= the_repository
;
1652 struct ref
*ref
= copy_ref_list(orig_ref
);
1653 enum fetch_state state
= FETCH_CHECK_LOCAL
;
1654 struct oidset common
= OIDSET_INIT
;
1655 struct packet_reader reader
;
1656 int in_vain
= 0, negotiation_started
= 0;
1657 int negotiation_round
= 0;
1658 int haves_to_send
= INITIAL_FLUSH
;
1659 struct fetch_negotiator negotiator_alloc
;
1660 struct fetch_negotiator
*negotiator
;
1662 struct object_id common_oid
;
1663 int received_ready
= 0;
1664 struct string_list packfile_uris
= STRING_LIST_INIT_DUP
;
1666 struct strvec index_pack_args
= STRVEC_INIT
;
1668 negotiator
= &negotiator_alloc
;
1670 fetch_negotiator_init_noop(negotiator
);
1672 fetch_negotiator_init(r
, negotiator
);
1674 packet_reader_init(&reader
, fd
[0], NULL
, 0,
1675 PACKET_READ_CHOMP_NEWLINE
|
1676 PACKET_READ_DIE_ON_ERR_PACKET
);
1677 if (git_env_bool("GIT_TEST_SIDEBAND_ALL", 1) &&
1678 server_supports_feature("fetch", "sideband-all", 0)) {
1679 reader
.use_sideband
= 1;
1680 reader
.me
= "fetch-pack";
1683 while (state
!= FETCH_DONE
) {
1685 case FETCH_CHECK_LOCAL
:
1686 sort_ref_list(&ref
, ref_compare_name
);
1687 QSORT(sought
, nr_sought
, cmp_ref_by_name
);
1689 /* v2 supports these by default */
1690 allow_unadvertised_object_request
|= ALLOW_REACHABLE_SHA1
;
1692 if (args
->depth
> 0 || args
->deepen_since
|| args
->deepen_not
)
1695 /* Filter 'ref' by 'sought' and those that aren't local */
1696 mark_complete_and_common_ref(negotiator
, args
, &ref
);
1697 filter_refs(args
, &ref
, sought
, nr_sought
);
1698 if (!args
->refetch
&& everything_local(args
, &ref
))
1701 state
= FETCH_SEND_REQUEST
;
1703 mark_tips(negotiator
, args
->negotiation_tips
);
1704 for_each_cached_alternate(negotiator
,
1705 insert_one_alternate_object
);
1707 case FETCH_SEND_REQUEST
:
1708 if (!negotiation_started
) {
1709 negotiation_started
= 1;
1710 trace2_region_enter("fetch-pack",
1714 negotiation_round
++;
1715 trace2_region_enter_printf("negotiation_v2", "round",
1716 the_repository
, "%d",
1718 if (send_fetch_request(negotiator
, fd
[1], args
, ref
,
1720 &haves_to_send
, &in_vain
,
1721 reader
.use_sideband
,
1723 trace2_region_leave_printf("negotiation_v2", "round",
1724 the_repository
, "%d",
1726 state
= FETCH_GET_PACK
;
1729 state
= FETCH_PROCESS_ACKS
;
1731 case FETCH_PROCESS_ACKS
:
1732 /* Process ACKs/NAKs */
1733 process_section_header(&reader
, "acknowledgments", 0);
1734 while (process_ack(negotiator
, &reader
, &common_oid
,
1738 oidset_insert(&common
, &common_oid
);
1740 trace2_region_leave_printf("negotiation_v2", "round",
1741 the_repository
, "%d",
1743 if (received_ready
) {
1745 * Don't check for response delimiter; get_pack() will
1746 * read the rest of this response.
1748 state
= FETCH_GET_PACK
;
1750 do_check_stateless_delimiter(args
->stateless_rpc
, &reader
);
1751 state
= FETCH_SEND_REQUEST
;
1754 case FETCH_GET_PACK
:
1755 trace2_region_leave("fetch-pack",
1758 trace2_data_intmax("negotiation_v2", the_repository
,
1759 "total_rounds", negotiation_round
);
1760 /* Check for shallow-info section */
1761 if (process_section_header(&reader
, "shallow-info", 1))
1762 receive_shallow_info(args
, &reader
, shallows
, si
);
1764 if (process_section_header(&reader
, "wanted-refs", 1))
1765 receive_wanted_refs(&reader
, sought
, nr_sought
);
1767 /* get the pack(s) */
1768 if (git_env_bool("GIT_TRACE_REDACT", 1))
1769 reader
.options
|= PACKET_READ_REDACT_URI_PATH
;
1770 if (process_section_header(&reader
, "packfile-uris", 1))
1771 receive_packfile_uris(&reader
, &packfile_uris
);
1772 /* We don't expect more URIs. Reset to avoid expensive URI check. */
1773 reader
.options
&= ~PACKET_READ_REDACT_URI_PATH
;
1775 process_section_header(&reader
, "packfile", 0);
1778 * this is the final request we'll make of the server;
1779 * do a half-duplex shutdown to indicate that they can
1780 * hang up as soon as the pack is sent.
1785 if (get_pack(args
, fd
, pack_lockfiles
,
1786 packfile_uris
.nr
? &index_pack_args
: NULL
,
1787 sought
, nr_sought
, &fsck_options
.gitmodules_found
))
1788 die(_("git fetch-pack: fetch failed."));
1789 do_check_stateless_delimiter(args
->stateless_rpc
, &reader
);
1798 for (i
= 0; i
< packfile_uris
.nr
; i
++) {
1800 struct child_process cmd
= CHILD_PROCESS_INIT
;
1801 char packname
[GIT_MAX_HEXSZ
+ 1];
1802 const char *uri
= packfile_uris
.items
[i
].string
+
1803 the_hash_algo
->hexsz
+ 1;
1805 strvec_push(&cmd
.args
, "http-fetch");
1806 strvec_pushf(&cmd
.args
, "--packfile=%.*s",
1807 (int) the_hash_algo
->hexsz
,
1808 packfile_uris
.items
[i
].string
);
1809 for (j
= 0; j
< index_pack_args
.nr
; j
++)
1810 strvec_pushf(&cmd
.args
, "--index-pack-arg=%s",
1811 index_pack_args
.v
[j
]);
1812 strvec_push(&cmd
.args
, uri
);
1816 if (start_command(&cmd
))
1817 die("fetch-pack: unable to spawn http-fetch");
1819 if (read_in_full(cmd
.out
, packname
, 5) < 0 ||
1820 memcmp(packname
, "keep\t", 5))
1821 die("fetch-pack: expected keep then TAB at start of http-fetch output");
1823 if (read_in_full(cmd
.out
, packname
,
1824 the_hash_algo
->hexsz
+ 1) < 0 ||
1825 packname
[the_hash_algo
->hexsz
] != '\n')
1826 die("fetch-pack: expected hash then LF at end of http-fetch output");
1828 packname
[the_hash_algo
->hexsz
] = '\0';
1830 parse_gitmodules_oids(cmd
.out
, &fsck_options
.gitmodules_found
);
1834 if (finish_command(&cmd
))
1835 die("fetch-pack: unable to finish http-fetch");
1837 if (memcmp(packfile_uris
.items
[i
].string
, packname
,
1838 the_hash_algo
->hexsz
))
1839 die("fetch-pack: pack downloaded from %s does not match expected hash %.*s",
1840 uri
, (int) the_hash_algo
->hexsz
,
1841 packfile_uris
.items
[i
].string
);
1843 string_list_append_nodup(pack_lockfiles
,
1844 xstrfmt("%s/pack/pack-%s.keep",
1845 get_object_directory(),
1848 string_list_clear(&packfile_uris
, 0);
1849 strvec_clear(&index_pack_args
);
1851 if (fsck_finish(&fsck_options
))
1855 negotiator
->release(negotiator
);
1857 oidset_clear(&common
);
1861 static int fetch_pack_config_cb(const char *var
, const char *value
, void *cb
)
1863 if (strcmp(var
, "fetch.fsck.skiplist") == 0) {
1866 if (git_config_pathname(&path
, var
, value
))
1868 strbuf_addf(&fsck_msg_types
, "%cskiplist=%s",
1869 fsck_msg_types
.len
? ',' : '=', path
);
1874 if (skip_prefix(var
, "fetch.fsck.", &var
)) {
1875 if (is_valid_msg_type(var
, value
))
1876 strbuf_addf(&fsck_msg_types
, "%c%s=%s",
1877 fsck_msg_types
.len
? ',' : '=', var
, value
);
1879 warning("Skipping unknown msg id '%s'", var
);
1883 return git_default_config(var
, value
, cb
);
1886 static void fetch_pack_config(void)
1888 git_config_get_int("fetch.unpacklimit", &fetch_unpack_limit
);
1889 git_config_get_int("transfer.unpacklimit", &transfer_unpack_limit
);
1890 git_config_get_bool("repack.usedeltabaseoffset", &prefer_ofs_delta
);
1891 git_config_get_bool("fetch.fsckobjects", &fetch_fsck_objects
);
1892 git_config_get_bool("transfer.fsckobjects", &transfer_fsck_objects
);
1893 git_config_get_bool("transfer.advertisesid", &advertise_sid
);
1894 if (!uri_protocols
.nr
) {
1897 if (!git_config_get_string("fetch.uriprotocols", &str
) && str
) {
1898 string_list_split(&uri_protocols
, str
, ',', -1);
1903 git_config(fetch_pack_config_cb
, NULL
);
1906 static void fetch_pack_setup(void)
1908 static int did_setup
;
1911 fetch_pack_config();
1912 if (0 <= transfer_unpack_limit
)
1913 unpack_limit
= transfer_unpack_limit
;
1914 else if (0 <= fetch_unpack_limit
)
1915 unpack_limit
= fetch_unpack_limit
;
1919 static int remove_duplicates_in_refs(struct ref
**ref
, int nr
)
1921 struct string_list names
= STRING_LIST_INIT_NODUP
;
1924 for (src
= dst
= 0; src
< nr
; src
++) {
1925 struct string_list_item
*item
;
1926 item
= string_list_insert(&names
, ref
[src
]->name
);
1928 continue; /* already have it */
1929 item
->util
= ref
[src
];
1931 ref
[dst
] = ref
[src
];
1934 for (src
= dst
; src
< nr
; src
++)
1936 string_list_clear(&names
, 0);
1940 static void update_shallow(struct fetch_pack_args
*args
,
1941 struct ref
**sought
, int nr_sought
,
1942 struct shallow_info
*si
)
1944 struct oid_array ref
= OID_ARRAY_INIT
;
1948 if (args
->deepen
&& alternate_shallow_file
) {
1949 if (*alternate_shallow_file
== '\0') { /* --unshallow */
1950 unlink_or_warn(git_path_shallow(the_repository
));
1951 rollback_shallow_file(the_repository
, &shallow_lock
);
1953 commit_shallow_file(the_repository
, &shallow_lock
);
1954 alternate_shallow_file
= NULL
;
1958 if (!si
->shallow
|| !si
->shallow
->nr
)
1961 if (args
->cloning
) {
1963 * remote is shallow, but this is a clone, there are
1964 * no objects in repo to worry about. Accept any
1965 * shallow points that exist in the pack (iow in repo
1966 * after get_pack() and reprepare_packed_git())
1968 struct oid_array extra
= OID_ARRAY_INIT
;
1969 struct object_id
*oid
= si
->shallow
->oid
;
1970 for (i
= 0; i
< si
->shallow
->nr
; i
++)
1971 if (repo_has_object_file(the_repository
, &oid
[i
]))
1972 oid_array_append(&extra
, &oid
[i
]);
1974 setup_alternate_shallow(&shallow_lock
,
1975 &alternate_shallow_file
,
1977 commit_shallow_file(the_repository
, &shallow_lock
);
1978 alternate_shallow_file
= NULL
;
1980 oid_array_clear(&extra
);
1984 if (!si
->nr_ours
&& !si
->nr_theirs
)
1987 remove_nonexistent_theirs_shallow(si
);
1988 if (!si
->nr_ours
&& !si
->nr_theirs
)
1990 for (i
= 0; i
< nr_sought
; i
++)
1991 oid_array_append(&ref
, &sought
[i
]->old_oid
);
1994 if (args
->update_shallow
) {
1996 * remote is also shallow, .git/shallow may be updated
1997 * so all refs can be accepted. Make sure we only add
1998 * shallow roots that are actually reachable from new
2001 struct oid_array extra
= OID_ARRAY_INIT
;
2002 struct object_id
*oid
= si
->shallow
->oid
;
2003 assign_shallow_commits_to_refs(si
, NULL
, NULL
);
2004 if (!si
->nr_ours
&& !si
->nr_theirs
) {
2005 oid_array_clear(&ref
);
2008 for (i
= 0; i
< si
->nr_ours
; i
++)
2009 oid_array_append(&extra
, &oid
[si
->ours
[i
]]);
2010 for (i
= 0; i
< si
->nr_theirs
; i
++)
2011 oid_array_append(&extra
, &oid
[si
->theirs
[i
]]);
2012 setup_alternate_shallow(&shallow_lock
,
2013 &alternate_shallow_file
,
2015 commit_shallow_file(the_repository
, &shallow_lock
);
2016 oid_array_clear(&extra
);
2017 oid_array_clear(&ref
);
2018 alternate_shallow_file
= NULL
;
2023 * remote is also shallow, check what ref is safe to update
2024 * without updating .git/shallow
2026 CALLOC_ARRAY(status
, nr_sought
);
2027 assign_shallow_commits_to_refs(si
, NULL
, status
);
2028 if (si
->nr_ours
|| si
->nr_theirs
) {
2029 for (i
= 0; i
< nr_sought
; i
++)
2031 sought
[i
]->status
= REF_STATUS_REJECT_SHALLOW
;
2034 oid_array_clear(&ref
);
2037 static const struct object_id
*iterate_ref_map(void *cb_data
)
2039 struct ref
**rm
= cb_data
;
2040 struct ref
*ref
= *rm
;
2045 return &ref
->old_oid
;
2048 struct ref
*fetch_pack(struct fetch_pack_args
*args
,
2050 const struct ref
*ref
,
2051 struct ref
**sought
, int nr_sought
,
2052 struct oid_array
*shallow
,
2053 struct string_list
*pack_lockfiles
,
2054 enum protocol_version version
)
2056 struct ref
*ref_cpy
;
2057 struct shallow_info si
;
2058 struct oid_array shallows_scratch
= OID_ARRAY_INIT
;
2062 nr_sought
= remove_duplicates_in_refs(sought
, nr_sought
);
2064 if (version
!= protocol_v2
&& !ref
) {
2065 packet_flush(fd
[1]);
2066 die(_("no matching remote head"));
2068 if (version
== protocol_v2
) {
2070 BUG("Protocol V2 does not provide shallows at this point in the fetch");
2071 memset(&si
, 0, sizeof(si
));
2072 ref_cpy
= do_fetch_pack_v2(args
, fd
, ref
, sought
, nr_sought
,
2073 &shallows_scratch
, &si
,
2076 prepare_shallow_info(&si
, shallow
);
2077 ref_cpy
= do_fetch_pack(args
, fd
, ref
, sought
, nr_sought
,
2078 &si
, pack_lockfiles
);
2080 reprepare_packed_git(the_repository
);
2082 if (!args
->cloning
&& args
->deepen
) {
2083 struct check_connected_options opt
= CHECK_CONNECTED_INIT
;
2084 struct ref
*iterator
= ref_cpy
;
2085 opt
.shallow_file
= alternate_shallow_file
;
2087 opt
.is_deepening_fetch
= 1;
2088 if (check_connected(iterate_ref_map
, &iterator
, &opt
)) {
2089 error(_("remote did not send all necessary objects"));
2092 rollback_shallow_file(the_repository
, &shallow_lock
);
2095 args
->connectivity_checked
= 1;
2098 update_shallow(args
, sought
, nr_sought
, &si
);
2100 clear_shallow_info(&si
);
2101 oid_array_clear(&shallows_scratch
);
2105 static int add_to_object_array(const struct object_id
*oid
, void *data
)
2107 struct object_array
*a
= data
;
2109 add_object_array(lookup_object(the_repository
, oid
), "", a
);
2113 static void clear_common_flag(struct oidset
*s
)
2115 struct oidset_iter iter
;
2116 const struct object_id
*oid
;
2117 oidset_iter_init(s
, &iter
);
2119 while ((oid
= oidset_iter_next(&iter
))) {
2120 struct object
*obj
= lookup_object(the_repository
, oid
);
2121 obj
->flags
&= ~COMMON
;
2125 void negotiate_using_fetch(const struct oid_array
*negotiation_tips
,
2126 const struct string_list
*server_options
,
2129 struct oidset
*acked_commits
)
2131 struct fetch_negotiator negotiator
;
2132 struct packet_reader reader
;
2133 struct object_array nt_object_array
= OBJECT_ARRAY_INIT
;
2134 struct strbuf req_buf
= STRBUF_INIT
;
2135 int haves_to_send
= INITIAL_FLUSH
;
2138 int last_iteration
= 0;
2139 int negotiation_round
= 0;
2140 timestamp_t min_generation
= GENERATION_NUMBER_INFINITY
;
2142 fetch_negotiator_init(the_repository
, &negotiator
);
2143 mark_tips(&negotiator
, negotiation_tips
);
2145 packet_reader_init(&reader
, fd
[0], NULL
, 0,
2146 PACKET_READ_CHOMP_NEWLINE
|
2147 PACKET_READ_DIE_ON_ERR_PACKET
);
2149 oid_array_for_each((struct oid_array
*) negotiation_tips
,
2150 add_to_object_array
,
2153 trace2_region_enter("fetch-pack", "negotiate_using_fetch", the_repository
);
2154 while (!last_iteration
) {
2156 struct object_id common_oid
;
2157 int received_ready
= 0;
2159 negotiation_round
++;
2161 trace2_region_enter_printf("negotiate_using_fetch", "round",
2162 the_repository
, "%d",
2164 strbuf_reset(&req_buf
);
2165 write_fetch_command_and_capabilities(&req_buf
, server_options
);
2167 packet_buf_write(&req_buf
, "wait-for-done");
2169 haves_added
= add_haves(&negotiator
, &req_buf
, &haves_to_send
);
2170 in_vain
+= haves_added
;
2171 if (!haves_added
|| (seen_ack
&& in_vain
>= MAX_IN_VAIN
))
2174 trace2_data_intmax("negotiate_using_fetch", the_repository
,
2175 "haves_added", haves_added
);
2176 trace2_data_intmax("negotiate_using_fetch", the_repository
,
2177 "in_vain", in_vain
);
2180 packet_buf_flush(&req_buf
);
2181 if (write_in_full(fd
[1], req_buf
.buf
, req_buf
.len
) < 0)
2182 die_errno(_("unable to write request to remote"));
2184 /* Process ACKs/NAKs */
2185 process_section_header(&reader
, "acknowledgments", 0);
2186 while (process_ack(&negotiator
, &reader
, &common_oid
,
2188 struct commit
*commit
= lookup_commit(the_repository
,
2191 timestamp_t generation
;
2193 parse_commit_or_die(commit
);
2194 commit
->object
.flags
|= COMMON
;
2195 generation
= commit_graph_generation(commit
);
2196 if (generation
< min_generation
)
2197 min_generation
= generation
;
2201 oidset_insert(acked_commits
, &common_oid
);
2204 die(_("unexpected 'ready' from remote"));
2206 do_check_stateless_delimiter(stateless_rpc
, &reader
);
2207 if (can_all_from_reach_with_flag(&nt_object_array
, COMMON
,
2211 trace2_region_leave_printf("negotiation", "round",
2212 the_repository
, "%d",
2215 trace2_region_enter("fetch-pack", "negotiate_using_fetch", the_repository
);
2216 trace2_data_intmax("negotiate_using_fetch", the_repository
,
2217 "total_rounds", negotiation_round
);
2218 clear_common_flag(acked_commits
);
2219 strbuf_release(&req_buf
);
2222 int report_unmatched_refs(struct ref
**sought
, int nr_sought
)
2226 for (i
= 0; i
< nr_sought
; i
++) {
2229 switch (sought
[i
]->match_status
) {
2232 case REF_NOT_MATCHED
:
2233 error(_("no such remote ref %s"), sought
[i
]->name
);
2235 case REF_UNADVERTISED_NOT_ALLOWED
:
2236 error(_("Server does not allow request for unadvertised object %s"),