1 #define USE_THE_REPOSITORY_VARIABLE
3 #include "git-compat-util.h"
4 #include "repository.h"
7 #include "environment.h"
17 #include "fetch-pack.h"
19 #include "run-command.h"
23 #include "oid-array.h"
26 #include "object-store-ll.h"
28 #include "connected.h"
29 #include "fetch-negotiator.h"
32 #include "commit-reach.h"
33 #include "commit-graph.h"
35 #include "mergesort.h"
37 static int transfer_unpack_limit
= -1;
38 static int fetch_unpack_limit
= -1;
39 static int unpack_limit
= 100;
40 static int prefer_ofs_delta
= 1;
42 static int deepen_since_ok
;
43 static int deepen_not_ok
;
44 static int fetch_fsck_objects
= -1;
45 static int transfer_fsck_objects
= -1;
46 static int agent_supported
;
47 static int server_supports_filtering
;
48 static int advertise_sid
;
49 static struct shallow_lock shallow_lock
;
50 static const char *alternate_shallow_file
;
51 static struct fsck_options fsck_options
= FSCK_OPTIONS_MISSING_GITMODULES
;
52 static struct strbuf fsck_msg_types
= STRBUF_INIT
;
53 static struct string_list uri_protocols
= STRING_LIST_INIT_DUP
;
55 /* Remember to update object flag allocation in object.h */
56 #define COMPLETE (1U << 0)
57 #define ALTERNATE (1U << 1)
58 #define COMMON (1U << 6)
59 #define REACH_SCRATCH (1U << 7)
62 * After sending this many "have"s if we do not get any new ACK , we
63 * give up traversing our history.
65 #define MAX_IN_VAIN 256
67 static int multi_ack
, use_sideband
;
68 /* Allow specifying sha1 if it is a ref tip. */
69 #define ALLOW_TIP_SHA1 01
70 /* Allow request of a sha1 if it is reachable from a ref (possibly hidden ref). */
71 #define ALLOW_REACHABLE_SHA1 02
72 static unsigned int allow_unadvertised_object_request
;
74 __attribute__((format (printf
, 2, 3)))
75 static inline void print_verbose(const struct fetch_pack_args
*args
,
83 va_start(params
, fmt
);
84 vfprintf(stderr
, fmt
, params
);
89 struct alternate_object_cache
{
90 struct object
**items
;
94 static void cache_one_alternate(const struct object_id
*oid
,
97 struct alternate_object_cache
*cache
= vcache
;
98 struct object
*obj
= parse_object(the_repository
, oid
);
100 if (!obj
|| (obj
->flags
& ALTERNATE
))
103 obj
->flags
|= ALTERNATE
;
104 ALLOC_GROW(cache
->items
, cache
->nr
+ 1, cache
->alloc
);
105 cache
->items
[cache
->nr
++] = obj
;
108 static void for_each_cached_alternate(struct fetch_negotiator
*negotiator
,
109 void (*cb
)(struct fetch_negotiator
*,
112 static int initialized
;
113 static struct alternate_object_cache cache
;
117 for_each_alternate_ref(cache_one_alternate
, &cache
);
121 for (i
= 0; i
< cache
.nr
; i
++)
122 cb(negotiator
, cache
.items
[i
]);
125 static struct commit
*deref_without_lazy_fetch_extended(const struct object_id
*oid
,
126 int mark_tags_complete
,
127 enum object_type
*type
,
128 unsigned int oi_flags
)
130 struct object_info info
= { .typep
= type
};
131 struct commit
*commit
;
133 commit
= lookup_commit_in_graph(the_repository
, oid
);
138 if (oid_object_info_extended(the_repository
, oid
, &info
,
141 if (*type
== OBJ_TAG
) {
142 struct tag
*tag
= (struct tag
*)
143 parse_object(the_repository
, oid
);
147 if (mark_tags_complete
)
148 tag
->object
.flags
|= COMPLETE
;
149 oid
= &tag
->tagged
->oid
;
155 if (*type
== OBJ_COMMIT
) {
156 struct commit
*commit
= lookup_commit(the_repository
, oid
);
157 if (!commit
|| repo_parse_commit(the_repository
, commit
))
166 static struct commit
*deref_without_lazy_fetch(const struct object_id
*oid
,
167 int mark_tags_complete
)
169 enum object_type type
;
170 unsigned flags
= OBJECT_INFO_SKIP_FETCH_OBJECT
| OBJECT_INFO_QUICK
;
171 return deref_without_lazy_fetch_extended(oid
, mark_tags_complete
,
175 static int rev_list_insert_ref(struct fetch_negotiator
*negotiator
,
176 const struct object_id
*oid
)
178 struct commit
*c
= deref_without_lazy_fetch(oid
, 0);
181 negotiator
->add_tip(negotiator
, c
);
185 static int rev_list_insert_ref_oid(const char *refname UNUSED
,
186 const char *referent 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 refs_for_each_rawref(get_main_ref_store(the_repository
),
297 rev_list_insert_ref_oid
, negotiator
);
301 for (i
= 0; i
< negotiation_tips
->nr
; i
++)
302 rev_list_insert_ref(negotiator
, &negotiation_tips
->oid
[i
]);
306 static void send_filter(struct fetch_pack_args
*args
,
307 struct strbuf
*req_buf
,
308 int server_supports_filter
)
310 if (args
->filter_options
.choice
) {
312 expand_list_objects_filter_spec(&args
->filter_options
);
313 if (server_supports_filter
) {
314 print_verbose(args
, _("Server supports filter"));
315 packet_buf_write(req_buf
, "filter %s", spec
);
316 trace2_data_string("fetch", the_repository
,
317 "filter/effective", spec
);
319 warning("filtering not recognized by server, ignoring");
320 trace2_data_string("fetch", the_repository
,
321 "filter/unsupported", spec
);
324 trace2_data_string("fetch", the_repository
,
329 static int find_common(struct fetch_negotiator
*negotiator
,
330 struct fetch_pack_args
*args
,
331 int fd
[2], struct object_id
*result_oid
,
335 int count
= 0, flushes
= 0, flush_at
= INITIAL_FLUSH
, retval
;
336 int negotiation_round
= 0, haves
= 0;
337 const struct object_id
*oid
;
338 unsigned in_vain
= 0;
339 int got_continue
= 0;
341 struct strbuf req_buf
= STRBUF_INIT
;
342 size_t state_len
= 0;
343 struct packet_reader reader
;
345 if (args
->stateless_rpc
&& multi_ack
== 1)
346 die(_("the option '%s' requires '%s'"), "--stateless-rpc", "multi_ack_detailed");
348 packet_reader_init(&reader
, fd
[0], NULL
, 0,
349 PACKET_READ_CHOMP_NEWLINE
|
350 PACKET_READ_DIE_ON_ERR_PACKET
);
352 mark_tips(negotiator
, args
->negotiation_tips
);
353 for_each_cached_alternate(negotiator
, insert_one_alternate_object
);
356 for ( ; refs
; refs
= refs
->next
) {
357 struct object_id
*remote
= &refs
->old_oid
;
358 const char *remote_hex
;
361 if (!args
->refetch
) {
363 * If that object is complete (i.e. it is an ancestor of a
364 * local ref), we tell them we have it but do not have to
365 * tell them about its ancestors, which they already know
368 * We use lookup_object here because we are only
369 * interested in the case we *know* the object is
370 * reachable and we have already scanned it.
372 if (((o
= lookup_object(the_repository
, remote
)) != NULL
) &&
373 (o
->flags
& COMPLETE
)) {
378 remote_hex
= oid_to_hex(remote
);
380 struct strbuf c
= STRBUF_INIT
;
381 if (multi_ack
== 2) strbuf_addstr(&c
, " multi_ack_detailed");
382 if (multi_ack
== 1) strbuf_addstr(&c
, " multi_ack");
383 if (no_done
) strbuf_addstr(&c
, " no-done");
384 if (use_sideband
== 2) strbuf_addstr(&c
, " side-band-64k");
385 if (use_sideband
== 1) strbuf_addstr(&c
, " side-band");
386 if (args
->deepen_relative
) strbuf_addstr(&c
, " deepen-relative");
387 if (args
->use_thin_pack
) strbuf_addstr(&c
, " thin-pack");
388 if (args
->no_progress
) strbuf_addstr(&c
, " no-progress");
389 if (args
->include_tag
) strbuf_addstr(&c
, " include-tag");
390 if (prefer_ofs_delta
) strbuf_addstr(&c
, " ofs-delta");
391 if (deepen_since_ok
) strbuf_addstr(&c
, " deepen-since");
392 if (deepen_not_ok
) strbuf_addstr(&c
, " deepen-not");
393 if (agent_supported
) strbuf_addf(&c
, " agent=%s",
394 git_user_agent_sanitized());
396 strbuf_addf(&c
, " session-id=%s", trace2_session_id());
397 if (args
->filter_options
.choice
)
398 strbuf_addstr(&c
, " filter");
399 packet_buf_write(&req_buf
, "want %s%s\n", remote_hex
, c
.buf
);
402 packet_buf_write(&req_buf
, "want %s\n", remote_hex
);
407 strbuf_release(&req_buf
);
412 if (is_repository_shallow(the_repository
))
413 write_shallow_commits(&req_buf
, 1, NULL
);
415 packet_buf_write(&req_buf
, "deepen %d", args
->depth
);
416 if (args
->deepen_since
) {
417 timestamp_t max_age
= approxidate(args
->deepen_since
);
418 packet_buf_write(&req_buf
, "deepen-since %"PRItime
, max_age
);
420 if (args
->deepen_not
) {
422 for (i
= 0; i
< args
->deepen_not
->nr
; i
++) {
423 struct string_list_item
*s
= args
->deepen_not
->items
+ i
;
424 packet_buf_write(&req_buf
, "deepen-not %s", s
->string
);
427 send_filter(args
, &req_buf
, server_supports_filtering
);
428 packet_buf_flush(&req_buf
);
429 state_len
= req_buf
.len
;
433 struct object_id oid
;
435 send_request(args
, fd
[1], &req_buf
);
436 while (packet_reader_read(&reader
) == PACKET_READ_NORMAL
) {
437 if (skip_prefix(reader
.line
, "shallow ", &arg
)) {
438 if (get_oid_hex(arg
, &oid
))
439 die(_("invalid shallow line: %s"), reader
.line
);
440 register_shallow(the_repository
, &oid
);
443 if (skip_prefix(reader
.line
, "unshallow ", &arg
)) {
444 if (get_oid_hex(arg
, &oid
))
445 die(_("invalid unshallow line: %s"), reader
.line
);
446 if (!lookup_object(the_repository
, &oid
))
447 die(_("object not found: %s"), reader
.line
);
448 /* make sure that it is parsed as shallow */
449 if (!parse_object(the_repository
, &oid
))
450 die(_("error in object: %s"), reader
.line
);
451 if (unregister_shallow(&oid
))
452 die(_("no shallow found: %s"), reader
.line
);
455 die(_("expected shallow/unshallow, got %s"), reader
.line
);
457 } else if (!args
->stateless_rpc
)
458 send_request(args
, fd
[1], &req_buf
);
460 if (!args
->stateless_rpc
) {
461 /* If we aren't using the stateless-rpc interface
462 * we don't need to retain the headers.
464 strbuf_setlen(&req_buf
, 0);
468 trace2_region_enter("fetch-pack", "negotiation_v0_v1", the_repository
);
471 while ((oid
= negotiator
->next(negotiator
))) {
472 packet_buf_write(&req_buf
, "have %s\n", oid_to_hex(oid
));
473 print_verbose(args
, "have %s", oid_to_hex(oid
));
476 if (flush_at
<= ++count
) {
480 trace2_region_enter_printf("negotiation_v0_v1", "round",
481 the_repository
, "%d",
483 trace2_data_intmax("negotiation_v0_v1", the_repository
,
484 "haves_added", haves
);
485 trace2_data_intmax("negotiation_v0_v1", the_repository
,
488 packet_buf_flush(&req_buf
);
489 send_request(args
, fd
[1], &req_buf
);
490 strbuf_setlen(&req_buf
, state_len
);
492 flush_at
= next_flush(args
->stateless_rpc
, count
);
495 * We keep one window "ahead" of the other side, and
496 * will wait for an ACK only on the next one
498 if (!args
->stateless_rpc
&& count
== INITIAL_FLUSH
)
501 consume_shallow_list(args
, &reader
);
503 ack
= get_ack(&reader
, result_oid
);
505 print_verbose(args
, _("got %s %d %s"), "ack",
506 ack
, oid_to_hex(result_oid
));
509 trace2_region_leave_printf("negotiation_v0_v1", "round",
510 the_repository
, "%d",
519 struct commit
*commit
=
520 lookup_commit(the_repository
,
525 die(_("invalid commit %s"), oid_to_hex(result_oid
));
526 was_common
= negotiator
->ack(negotiator
, commit
);
527 if (args
->stateless_rpc
530 /* We need to replay the have for this object
531 * on the next RPC request so the peer knows
532 * it is in common with us.
534 const char *hex
= oid_to_hex(result_oid
);
535 packet_buf_write(&req_buf
, "have %s\n", hex
);
536 state_len
= req_buf
.len
;
539 * Reset in_vain because an ack
540 * for this commit has not been
544 } else if (!args
->stateless_rpc
545 || ack
!= ACK_common
)
549 if (ack
== ACK_ready
)
556 trace2_region_leave_printf("negotiation_v0_v1", "round",
557 the_repository
, "%d",
559 if (got_continue
&& MAX_IN_VAIN
< in_vain
) {
560 print_verbose(args
, _("giving up"));
568 trace2_region_leave("fetch-pack", "negotiation_v0_v1", the_repository
);
569 trace2_data_intmax("negotiation_v0_v1", the_repository
, "total_rounds",
571 if (!got_ready
|| !no_done
) {
572 packet_buf_write(&req_buf
, "done\n");
573 send_request(args
, fd
[1], &req_buf
);
575 print_verbose(args
, _("done"));
580 strbuf_release(&req_buf
);
582 if (!got_ready
|| !no_done
)
583 consume_shallow_list(args
, &reader
);
584 while (flushes
|| multi_ack
) {
585 int ack
= get_ack(&reader
, result_oid
);
587 print_verbose(args
, _("got %s (%d) %s"), "ack",
588 ack
, oid_to_hex(result_oid
));
596 /* it is no error to fetch into a completely empty repo */
597 return count
? retval
: 0;
600 static struct commit_list
*complete
;
602 static int mark_complete(const struct object_id
*oid
)
604 struct commit
*commit
= deref_without_lazy_fetch(oid
, 1);
606 if (commit
&& !(commit
->object
.flags
& COMPLETE
)) {
607 commit
->object
.flags
|= COMPLETE
;
608 commit_list_insert(commit
, &complete
);
613 static int mark_complete_oid(const char *refname UNUSED
,
614 const char *referent UNUSED
,
615 const struct object_id
*oid
,
617 void *cb_data UNUSED
)
619 return mark_complete(oid
);
622 static void mark_recent_complete_commits(struct fetch_pack_args
*args
,
625 while (complete
&& cutoff
<= complete
->item
->date
) {
626 print_verbose(args
, _("Marking %s as complete"),
627 oid_to_hex(&complete
->item
->object
.oid
));
628 pop_most_recent_commit(&complete
, COMPLETE
);
632 static void add_refs_to_oidset(struct oidset
*oids
, struct ref
*refs
)
634 for (; refs
; refs
= refs
->next
)
635 oidset_insert(oids
, &refs
->old_oid
);
638 static int is_unmatched_ref(const struct ref
*ref
)
640 struct object_id oid
;
642 return ref
->match_status
== REF_NOT_MATCHED
&&
643 !parse_oid_hex(ref
->name
, &oid
, &p
) &&
645 oideq(&oid
, &ref
->old_oid
);
648 static void filter_refs(struct fetch_pack_args
*args
,
650 struct ref
**sought
, int nr_sought
)
652 struct ref
*newlist
= NULL
;
653 struct ref
**newtail
= &newlist
;
654 struct ref
*unmatched
= NULL
;
655 struct ref
*ref
, *next
;
656 struct oidset tip_oids
= OIDSET_INIT
;
658 int strict
= !(allow_unadvertised_object_request
&
659 (ALLOW_TIP_SHA1
| ALLOW_REACHABLE_SHA1
));
662 for (ref
= *refs
; ref
; ref
= next
) {
666 if (starts_with(ref
->name
, "refs/") &&
667 check_refname_format(ref
->name
, 0)) {
669 * trash or a peeled value; do not even add it to
675 while (i
< nr_sought
) {
676 int cmp
= strcmp(ref
->name
, sought
[i
]->name
);
678 break; /* definitely do not have it */
680 keep
= 1; /* definitely have it */
681 sought
[i
]->match_status
= REF_MATCHED
;
686 if (!keep
&& args
->fetch_all
&&
687 (!args
->deepen
|| !starts_with(ref
->name
, "refs/tags/")))
694 newtail
= &ref
->next
;
696 ref
->next
= unmatched
;
702 for (i
= 0; i
< nr_sought
; i
++) {
704 if (!is_unmatched_ref(ref
))
707 add_refs_to_oidset(&tip_oids
, unmatched
);
708 add_refs_to_oidset(&tip_oids
, newlist
);
713 /* Append unmatched requests to the list */
714 for (i
= 0; i
< nr_sought
; i
++) {
716 if (!is_unmatched_ref(ref
))
719 if (!strict
|| oidset_contains(&tip_oids
, &ref
->old_oid
)) {
720 ref
->match_status
= REF_MATCHED
;
721 *newtail
= copy_ref(ref
);
722 newtail
= &(*newtail
)->next
;
724 ref
->match_status
= REF_UNADVERTISED_NOT_ALLOWED
;
728 oidset_clear(&tip_oids
);
729 free_refs(unmatched
);
734 static void mark_alternate_complete(struct fetch_negotiator
*negotiator UNUSED
,
737 mark_complete(&obj
->oid
);
741 * Mark recent commits available locally and reachable from a local ref as
744 * The cutoff time for recency is determined by this heuristic: it is the
745 * earliest commit time of the objects in refs that are commits and that we know
746 * the commit time of.
748 static void mark_complete_and_common_ref(struct fetch_negotiator
*negotiator
,
749 struct fetch_pack_args
*args
,
753 int old_save_commit_buffer
= save_commit_buffer
;
754 timestamp_t cutoff
= 0;
759 save_commit_buffer
= 0;
761 trace2_region_enter("fetch-pack", "parse_remote_refs_and_find_cutoff", NULL
);
762 for (ref
= *refs
; ref
; ref
= ref
->next
) {
763 struct commit
*commit
;
765 commit
= lookup_commit_in_graph(the_repository
, &ref
->old_oid
);
769 if (!repo_has_object_file_with_flags(the_repository
, &ref
->old_oid
,
771 OBJECT_INFO_SKIP_FETCH_OBJECT
))
773 o
= parse_object(the_repository
, &ref
->old_oid
);
774 if (!o
|| o
->type
!= OBJ_COMMIT
)
777 commit
= (struct commit
*)o
;
781 * We already have it -- which may mean that we were
782 * in sync with the other side at some time after
783 * that (it is OK if we guess wrong here).
785 if (!cutoff
|| cutoff
< commit
->date
)
786 cutoff
= commit
->date
;
788 trace2_region_leave("fetch-pack", "parse_remote_refs_and_find_cutoff", NULL
);
791 * This block marks all local refs as COMPLETE, and then recursively marks all
792 * parents of those refs as COMPLETE.
794 trace2_region_enter("fetch-pack", "mark_complete_local_refs", NULL
);
796 refs_for_each_rawref(get_main_ref_store(the_repository
),
797 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 fsck_objects
= fetch_pack_fsck_objects();
963 if (do_keep
|| args
->from_promisor
|| index_pack_args
|| fsck_objects
) {
964 if (pack_lockfiles
|| fsck_objects
)
966 cmd_name
= "index-pack";
967 strvec_push(&cmd
.args
, cmd_name
);
968 strvec_push(&cmd
.args
, "--stdin");
969 if (!args
->quiet
&& !args
->no_progress
)
970 strvec_push(&cmd
.args
, "-v");
971 if (args
->use_thin_pack
)
972 strvec_push(&cmd
.args
, "--fix-thin");
973 if ((do_keep
|| index_pack_args
) && (args
->lock_pack
|| unpack_limit
))
974 add_index_pack_keep_option(&cmd
.args
);
975 if (!index_pack_args
&& args
->check_self_contained_and_connected
)
976 strvec_push(&cmd
.args
, "--check-self-contained-and-connected");
979 * We cannot perform any connectivity checks because
980 * not all packs have been downloaded; let the caller
981 * have this responsibility.
983 args
->check_self_contained_and_connected
= 0;
985 if (args
->from_promisor
)
987 * create_promisor_file() may be called afterwards but
988 * we still need index-pack to know that this is a
989 * promisor pack. For example, if transfer.fsckobjects
990 * is true, index-pack needs to know that .gitmodules
991 * is a promisor object (so that it won't complain if
994 strvec_push(&cmd
.args
, "--promisor");
997 cmd_name
= "unpack-objects";
998 strvec_push(&cmd
.args
, cmd_name
);
999 if (args
->quiet
|| args
->no_progress
)
1000 strvec_push(&cmd
.args
, "-q");
1001 args
->check_self_contained_and_connected
= 0;
1005 strvec_pushf(&cmd
.args
, "--pack_header=%"PRIu32
",%"PRIu32
,
1006 ntohl(header
.hdr_version
),
1007 ntohl(header
.hdr_entries
));
1009 if (args
->from_promisor
|| index_pack_args
)
1011 * We cannot use --strict in index-pack because it
1012 * checks both broken objects and links, but we only
1013 * want to check for broken objects.
1015 strvec_push(&cmd
.args
, "--fsck-objects");
1017 strvec_pushf(&cmd
.args
, "--strict%s",
1018 fsck_msg_types
.buf
);
1021 if (index_pack_args
) {
1024 for (i
= 0; i
< cmd
.args
.nr
; i
++)
1025 strvec_push(index_pack_args
, cmd
.args
.v
[i
]);
1028 sigchain_push(SIGPIPE
, SIG_IGN
);
1032 if (start_command(&cmd
))
1033 die(_("fetch-pack: unable to fork off %s"), cmd_name
);
1034 if (do_keep
&& (pack_lockfiles
|| fsck_objects
)) {
1036 char *pack_lockfile
= index_pack_lockfile(cmd
.out
, &is_well_formed
);
1038 if (!is_well_formed
)
1039 die(_("fetch-pack: invalid index-pack output"));
1040 if (pack_lockfiles
&& pack_lockfile
)
1041 string_list_append_nodup(pack_lockfiles
, pack_lockfile
);
1043 free(pack_lockfile
);
1044 parse_gitmodules_oids(cmd
.out
, gitmodules_oids
);
1049 /* Closed by start_command() */
1052 ret
= finish_command(&cmd
);
1053 if (!ret
|| (args
->check_self_contained_and_connected
&& ret
== 1))
1054 args
->self_contained_and_connected
=
1055 args
->check_self_contained_and_connected
&&
1058 die(_("%s failed"), cmd_name
);
1059 if (use_sideband
&& finish_async(&demux
))
1060 die(_("error in sideband demultiplexer"));
1062 sigchain_pop(SIGPIPE
);
1065 * Now that index-pack has succeeded, write the promisor file using the
1066 * obtained .keep filename if necessary
1068 if (do_keep
&& pack_lockfiles
&& pack_lockfiles
->nr
&& args
->from_promisor
)
1069 create_promisor_file(pack_lockfiles
->items
[0].string
, sought
, nr_sought
);
1074 static int ref_compare_name(const struct ref
*a
, const struct ref
*b
)
1076 return strcmp(a
->name
, b
->name
);
1079 DEFINE_LIST_SORT(static, sort_ref_list
, struct ref
, next
);
1081 static int cmp_ref_by_name(const void *a_
, const void *b_
)
1083 const struct ref
*a
= *((const struct ref
**)a_
);
1084 const struct ref
*b
= *((const struct ref
**)b_
);
1085 return strcmp(a
->name
, b
->name
);
1088 static struct ref
*do_fetch_pack(struct fetch_pack_args
*args
,
1090 const struct ref
*orig_ref
,
1091 struct ref
**sought
, int nr_sought
,
1092 struct shallow_info
*si
,
1093 struct string_list
*pack_lockfiles
)
1095 struct repository
*r
= the_repository
;
1096 struct ref
*ref
= copy_ref_list(orig_ref
);
1097 struct object_id oid
;
1098 const char *agent_feature
;
1100 struct fetch_negotiator negotiator_alloc
;
1101 struct fetch_negotiator
*negotiator
;
1103 negotiator
= &negotiator_alloc
;
1104 if (args
->refetch
) {
1105 fetch_negotiator_init_noop(negotiator
);
1107 fetch_negotiator_init(r
, negotiator
);
1110 sort_ref_list(&ref
, ref_compare_name
);
1111 QSORT(sought
, nr_sought
, cmp_ref_by_name
);
1113 if ((agent_feature
= server_feature_value("agent", &agent_len
))) {
1114 agent_supported
= 1;
1116 print_verbose(args
, _("Server version is %.*s"),
1117 (int)agent_len
, agent_feature
);
1120 if (!server_supports("session-id"))
1123 if (server_supports("shallow"))
1124 print_verbose(args
, _("Server supports %s"), "shallow");
1125 else if (args
->depth
> 0 || is_repository_shallow(r
))
1126 die(_("Server does not support shallow clients"));
1127 if (args
->depth
> 0 || args
->deepen_since
|| args
->deepen_not
)
1129 if (server_supports("multi_ack_detailed")) {
1130 print_verbose(args
, _("Server supports %s"), "multi_ack_detailed");
1132 if (server_supports("no-done")) {
1133 print_verbose(args
, _("Server supports %s"), "no-done");
1134 if (args
->stateless_rpc
)
1138 else if (server_supports("multi_ack")) {
1139 print_verbose(args
, _("Server supports %s"), "multi_ack");
1142 if (server_supports("side-band-64k")) {
1143 print_verbose(args
, _("Server supports %s"), "side-band-64k");
1146 else if (server_supports("side-band")) {
1147 print_verbose(args
, _("Server supports %s"), "side-band");
1150 if (server_supports("allow-tip-sha1-in-want")) {
1151 print_verbose(args
, _("Server supports %s"), "allow-tip-sha1-in-want");
1152 allow_unadvertised_object_request
|= ALLOW_TIP_SHA1
;
1154 if (server_supports("allow-reachable-sha1-in-want")) {
1155 print_verbose(args
, _("Server supports %s"), "allow-reachable-sha1-in-want");
1156 allow_unadvertised_object_request
|= ALLOW_REACHABLE_SHA1
;
1158 if (server_supports("thin-pack"))
1159 print_verbose(args
, _("Server supports %s"), "thin-pack");
1161 args
->use_thin_pack
= 0;
1162 if (server_supports("no-progress"))
1163 print_verbose(args
, _("Server supports %s"), "no-progress");
1165 args
->no_progress
= 0;
1166 if (server_supports("include-tag"))
1167 print_verbose(args
, _("Server supports %s"), "include-tag");
1169 args
->include_tag
= 0;
1170 if (server_supports("ofs-delta"))
1171 print_verbose(args
, _("Server supports %s"), "ofs-delta");
1173 prefer_ofs_delta
= 0;
1175 if (server_supports("filter")) {
1176 server_supports_filtering
= 1;
1177 print_verbose(args
, _("Server supports %s"), "filter");
1178 } else if (args
->filter_options
.choice
) {
1179 warning("filtering not recognized by server, ignoring");
1182 if (server_supports("deepen-since")) {
1183 print_verbose(args
, _("Server supports %s"), "deepen-since");
1184 deepen_since_ok
= 1;
1185 } else if (args
->deepen_since
)
1186 die(_("Server does not support --shallow-since"));
1187 if (server_supports("deepen-not")) {
1188 print_verbose(args
, _("Server supports %s"), "deepen-not");
1190 } else if (args
->deepen_not
)
1191 die(_("Server does not support --shallow-exclude"));
1192 if (server_supports("deepen-relative"))
1193 print_verbose(args
, _("Server supports %s"), "deepen-relative");
1194 else if (args
->deepen_relative
)
1195 die(_("Server does not support --deepen"));
1196 if (!server_supports_hash(the_hash_algo
->name
, NULL
))
1197 die(_("Server does not support this repository's object format"));
1199 mark_complete_and_common_ref(negotiator
, args
, &ref
);
1200 filter_refs(args
, &ref
, sought
, nr_sought
);
1201 if (!args
->refetch
&& everything_local(args
, &ref
)) {
1202 packet_flush(fd
[1]);
1205 if (find_common(negotiator
, args
, fd
, &oid
, ref
) < 0)
1206 if (!args
->keep_pack
)
1207 /* When cloning, it is not unusual to have
1210 warning(_("no common commits"));
1212 if (args
->stateless_rpc
)
1213 packet_flush(fd
[1]);
1215 setup_alternate_shallow(&shallow_lock
, &alternate_shallow_file
,
1217 else if (si
->nr_ours
|| si
->nr_theirs
) {
1218 if (args
->reject_shallow_remote
)
1219 die(_("source repository is shallow, reject to clone."));
1220 alternate_shallow_file
= setup_temporary_shallow(si
->shallow
);
1222 alternate_shallow_file
= NULL
;
1223 if (get_pack(args
, fd
, pack_lockfiles
, NULL
, sought
, nr_sought
,
1224 &fsck_options
.gitmodules_found
))
1225 die(_("git fetch-pack: fetch failed."));
1226 if (fsck_finish(&fsck_options
))
1231 negotiator
->release(negotiator
);
1235 static void add_shallow_requests(struct strbuf
*req_buf
,
1236 const struct fetch_pack_args
*args
)
1238 if (is_repository_shallow(the_repository
))
1239 write_shallow_commits(req_buf
, 1, NULL
);
1240 if (args
->depth
> 0)
1241 packet_buf_write(req_buf
, "deepen %d", args
->depth
);
1242 if (args
->deepen_since
) {
1243 timestamp_t max_age
= approxidate(args
->deepen_since
);
1244 packet_buf_write(req_buf
, "deepen-since %"PRItime
, max_age
);
1246 if (args
->deepen_not
) {
1248 for (i
= 0; i
< args
->deepen_not
->nr
; i
++) {
1249 struct string_list_item
*s
= args
->deepen_not
->items
+ i
;
1250 packet_buf_write(req_buf
, "deepen-not %s", s
->string
);
1253 if (args
->deepen_relative
)
1254 packet_buf_write(req_buf
, "deepen-relative\n");
1257 static void add_wants(const struct ref
*wants
, struct strbuf
*req_buf
)
1259 int use_ref_in_want
= server_supports_feature("fetch", "ref-in-want", 0);
1261 for ( ; wants
; wants
= wants
->next
) {
1262 const struct object_id
*remote
= &wants
->old_oid
;
1266 * If that object is complete (i.e. it is an ancestor of a
1267 * local ref), we tell them we have it but do not have to
1268 * tell them about its ancestors, which they already know
1271 * We use lookup_object here because we are only
1272 * interested in the case we *know* the object is
1273 * reachable and we have already scanned it.
1275 if (((o
= lookup_object(the_repository
, remote
)) != NULL
) &&
1276 (o
->flags
& COMPLETE
)) {
1280 if (!use_ref_in_want
|| wants
->exact_oid
)
1281 packet_buf_write(req_buf
, "want %s\n", oid_to_hex(remote
));
1283 packet_buf_write(req_buf
, "want-ref %s\n", wants
->name
);
1287 static void add_common(struct strbuf
*req_buf
, struct oidset
*common
)
1289 struct oidset_iter iter
;
1290 const struct object_id
*oid
;
1291 oidset_iter_init(common
, &iter
);
1293 while ((oid
= oidset_iter_next(&iter
))) {
1294 packet_buf_write(req_buf
, "have %s\n", oid_to_hex(oid
));
1298 static int add_haves(struct fetch_negotiator
*negotiator
,
1299 struct strbuf
*req_buf
,
1302 int haves_added
= 0;
1303 const struct object_id
*oid
;
1305 while ((oid
= negotiator
->next(negotiator
))) {
1306 packet_buf_write(req_buf
, "have %s\n", oid_to_hex(oid
));
1307 if (++haves_added
>= *haves_to_send
)
1311 /* Increase haves to send on next round */
1312 *haves_to_send
= next_flush(1, *haves_to_send
);
1317 static void write_fetch_command_and_capabilities(struct strbuf
*req_buf
,
1318 const struct string_list
*server_options
)
1320 const char *hash_name
;
1322 ensure_server_supports_v2("fetch");
1323 packet_buf_write(req_buf
, "command=fetch");
1324 if (server_supports_v2("agent"))
1325 packet_buf_write(req_buf
, "agent=%s", git_user_agent_sanitized());
1326 if (advertise_sid
&& server_supports_v2("session-id"))
1327 packet_buf_write(req_buf
, "session-id=%s", trace2_session_id());
1328 if (server_options
&& server_options
->nr
) {
1330 ensure_server_supports_v2("server-option");
1331 for (i
= 0; i
< server_options
->nr
; i
++)
1332 packet_buf_write(req_buf
, "server-option=%s",
1333 server_options
->items
[i
].string
);
1336 if (server_feature_v2("object-format", &hash_name
)) {
1337 int hash_algo
= hash_algo_by_name(hash_name
);
1338 if (hash_algo_by_ptr(the_hash_algo
) != hash_algo
)
1339 die(_("mismatched algorithms: client %s; server %s"),
1340 the_hash_algo
->name
, hash_name
);
1341 packet_buf_write(req_buf
, "object-format=%s", the_hash_algo
->name
);
1342 } else if (hash_algo_by_ptr(the_hash_algo
) != GIT_HASH_SHA1
) {
1343 die(_("the server does not support algorithm '%s'"),
1344 the_hash_algo
->name
);
1346 packet_buf_delim(req_buf
);
1349 static int send_fetch_request(struct fetch_negotiator
*negotiator
, int fd_out
,
1350 struct fetch_pack_args
*args
,
1351 const struct ref
*wants
, struct oidset
*common
,
1352 int *haves_to_send
, int *in_vain
,
1353 int sideband_all
, int seen_ack
)
1357 struct strbuf req_buf
= STRBUF_INIT
;
1359 write_fetch_command_and_capabilities(&req_buf
, args
->server_options
);
1361 if (args
->use_thin_pack
)
1362 packet_buf_write(&req_buf
, "thin-pack");
1363 if (args
->no_progress
)
1364 packet_buf_write(&req_buf
, "no-progress");
1365 if (args
->include_tag
)
1366 packet_buf_write(&req_buf
, "include-tag");
1367 if (prefer_ofs_delta
)
1368 packet_buf_write(&req_buf
, "ofs-delta");
1370 packet_buf_write(&req_buf
, "sideband-all");
1372 /* Add shallow-info and deepen request */
1373 if (server_supports_feature("fetch", "shallow", 0))
1374 add_shallow_requests(&req_buf
, args
);
1375 else if (is_repository_shallow(the_repository
) || args
->deepen
)
1376 die(_("Server does not support shallow requests"));
1379 send_filter(args
, &req_buf
,
1380 server_supports_feature("fetch", "filter", 0));
1382 if (server_supports_feature("fetch", "packfile-uris", 0)) {
1384 struct strbuf to_send
= STRBUF_INIT
;
1386 for (i
= 0; i
< uri_protocols
.nr
; i
++) {
1387 const char *s
= uri_protocols
.items
[i
].string
;
1389 if (!strcmp(s
, "https") || !strcmp(s
, "http")) {
1391 strbuf_addch(&to_send
, ',');
1392 strbuf_addstr(&to_send
, s
);
1396 packet_buf_write(&req_buf
, "packfile-uris %s",
1398 strbuf_release(&to_send
);
1403 add_wants(wants
, &req_buf
);
1405 /* Add all of the common commits we've found in previous rounds */
1406 add_common(&req_buf
, common
);
1408 haves_added
= add_haves(negotiator
, &req_buf
, haves_to_send
);
1409 *in_vain
+= haves_added
;
1410 trace2_data_intmax("negotiation_v2", the_repository
, "haves_added", haves_added
);
1411 trace2_data_intmax("negotiation_v2", the_repository
, "in_vain", *in_vain
);
1412 if (!haves_added
|| (seen_ack
&& *in_vain
>= MAX_IN_VAIN
)) {
1414 packet_buf_write(&req_buf
, "done\n");
1419 packet_buf_flush(&req_buf
);
1420 if (write_in_full(fd_out
, req_buf
.buf
, req_buf
.len
) < 0)
1421 die_errno(_("unable to write request to remote"));
1423 strbuf_release(&req_buf
);
1428 * Processes a section header in a server's response and checks if it matches
1429 * `section`. If the value of `peek` is 1, the header line will be peeked (and
1430 * not consumed); if 0, the line will be consumed and the function will die if
1431 * the section header doesn't match what was expected.
1433 static int process_section_header(struct packet_reader
*reader
,
1434 const char *section
, int peek
)
1438 if (packet_reader_peek(reader
) == PACKET_READ_NORMAL
&&
1439 !strcmp(reader
->line
, section
))
1445 die(_("expected '%s', received '%s'"),
1446 section
, reader
->line
);
1448 die(_("expected '%s'"), section
);
1450 packet_reader_read(reader
);
1456 static int process_ack(struct fetch_negotiator
*negotiator
,
1457 struct packet_reader
*reader
,
1458 struct object_id
*common_oid
,
1459 int *received_ready
)
1461 while (packet_reader_read(reader
) == PACKET_READ_NORMAL
) {
1464 if (!strcmp(reader
->line
, "NAK"))
1467 if (skip_prefix(reader
->line
, "ACK ", &arg
)) {
1468 if (!get_oid_hex(arg
, common_oid
)) {
1469 struct commit
*commit
;
1470 commit
= lookup_commit(the_repository
, common_oid
);
1472 negotiator
->ack(negotiator
, commit
);
1477 if (!strcmp(reader
->line
, "ready")) {
1478 *received_ready
= 1;
1482 die(_("unexpected acknowledgment line: '%s'"), reader
->line
);
1485 if (reader
->status
!= PACKET_READ_FLUSH
&&
1486 reader
->status
!= PACKET_READ_DELIM
)
1487 die(_("error processing acks: %d"), reader
->status
);
1490 * If an "acknowledgments" section is sent, a packfile is sent if and
1491 * only if "ready" was sent in this section. The other sections
1492 * ("shallow-info" and "wanted-refs") are sent only if a packfile is
1493 * sent. Therefore, a DELIM is expected if "ready" is sent, and a FLUSH
1496 if (*received_ready
&& reader
->status
!= PACKET_READ_DELIM
)
1498 * TRANSLATORS: The parameter will be 'ready', a protocol
1501 die(_("expected packfile to be sent after '%s'"), "ready");
1502 if (!*received_ready
&& reader
->status
!= PACKET_READ_FLUSH
)
1504 * TRANSLATORS: The parameter will be 'ready', a protocol
1507 die(_("expected no other sections to be sent after no '%s'"), "ready");
1512 static void receive_shallow_info(struct fetch_pack_args
*args
,
1513 struct packet_reader
*reader
,
1514 struct oid_array
*shallows
,
1515 struct shallow_info
*si
)
1517 int unshallow_received
= 0;
1519 process_section_header(reader
, "shallow-info", 0);
1520 while (packet_reader_read(reader
) == PACKET_READ_NORMAL
) {
1522 struct object_id oid
;
1524 if (skip_prefix(reader
->line
, "shallow ", &arg
)) {
1525 if (get_oid_hex(arg
, &oid
))
1526 die(_("invalid shallow line: %s"), reader
->line
);
1527 oid_array_append(shallows
, &oid
);
1530 if (skip_prefix(reader
->line
, "unshallow ", &arg
)) {
1531 if (get_oid_hex(arg
, &oid
))
1532 die(_("invalid unshallow line: %s"), reader
->line
);
1533 if (!lookup_object(the_repository
, &oid
))
1534 die(_("object not found: %s"), reader
->line
);
1535 /* make sure that it is parsed as shallow */
1536 if (!parse_object(the_repository
, &oid
))
1537 die(_("error in object: %s"), reader
->line
);
1538 if (unregister_shallow(&oid
))
1539 die(_("no shallow found: %s"), reader
->line
);
1540 unshallow_received
= 1;
1543 die(_("expected shallow/unshallow, got %s"), reader
->line
);
1546 if (reader
->status
!= PACKET_READ_FLUSH
&&
1547 reader
->status
!= PACKET_READ_DELIM
)
1548 die(_("error processing shallow info: %d"), reader
->status
);
1550 if (args
->deepen
|| unshallow_received
) {
1552 * Treat these as shallow lines caused by our depth settings.
1553 * In v0, these lines cannot cause refs to be rejected; do the
1558 for (i
= 0; i
< shallows
->nr
; i
++)
1559 register_shallow(the_repository
, &shallows
->oid
[i
]);
1560 setup_alternate_shallow(&shallow_lock
, &alternate_shallow_file
,
1563 } else if (shallows
->nr
) {
1565 * Treat these as shallow lines caused by the remote being
1566 * shallow. In v0, remote refs that reach these objects are
1567 * rejected (unless --update-shallow is set); do the same.
1569 prepare_shallow_info(si
, shallows
);
1570 if (si
->nr_ours
|| si
->nr_theirs
) {
1571 if (args
->reject_shallow_remote
)
1572 die(_("source repository is shallow, reject to clone."));
1573 alternate_shallow_file
=
1574 setup_temporary_shallow(si
->shallow
);
1576 alternate_shallow_file
= NULL
;
1578 alternate_shallow_file
= NULL
;
1582 static int cmp_name_ref(const void *name
, const void *ref
)
1584 return strcmp(name
, (*(struct ref
**)ref
)->name
);
1587 static void receive_wanted_refs(struct packet_reader
*reader
,
1588 struct ref
**sought
, int nr_sought
)
1590 process_section_header(reader
, "wanted-refs", 0);
1591 while (packet_reader_read(reader
) == PACKET_READ_NORMAL
) {
1592 struct object_id oid
;
1596 if (parse_oid_hex(reader
->line
, &oid
, &end
) || *end
++ != ' ')
1597 die(_("expected wanted-ref, got '%s'"), reader
->line
);
1599 found
= bsearch(end
, sought
, nr_sought
, sizeof(*sought
),
1602 die(_("unexpected wanted-ref: '%s'"), reader
->line
);
1603 oidcpy(&(*found
)->old_oid
, &oid
);
1606 if (reader
->status
!= PACKET_READ_DELIM
)
1607 die(_("error processing wanted refs: %d"), reader
->status
);
1610 static void receive_packfile_uris(struct packet_reader
*reader
,
1611 struct string_list
*uris
)
1613 process_section_header(reader
, "packfile-uris", 0);
1614 while (packet_reader_read(reader
) == PACKET_READ_NORMAL
) {
1615 if (reader
->pktlen
< the_hash_algo
->hexsz
||
1616 reader
->line
[the_hash_algo
->hexsz
] != ' ')
1617 die("expected '<hash> <uri>', got: %s\n", reader
->line
);
1619 string_list_append(uris
, reader
->line
);
1621 if (reader
->status
!= PACKET_READ_DELIM
)
1622 die("expected DELIM");
1626 FETCH_CHECK_LOCAL
= 0,
1633 static void do_check_stateless_delimiter(int stateless_rpc
,
1634 struct packet_reader
*reader
)
1636 check_stateless_delimiter(stateless_rpc
, reader
,
1637 _("git fetch-pack: expected response end packet"));
1640 static struct ref
*do_fetch_pack_v2(struct fetch_pack_args
*args
,
1642 const struct ref
*orig_ref
,
1643 struct ref
**sought
, int nr_sought
,
1644 struct oid_array
*shallows
,
1645 struct shallow_info
*si
,
1646 struct string_list
*pack_lockfiles
)
1648 struct repository
*r
= the_repository
;
1649 struct ref
*ref
= copy_ref_list(orig_ref
);
1650 enum fetch_state state
= FETCH_CHECK_LOCAL
;
1651 struct oidset common
= OIDSET_INIT
;
1652 struct packet_reader reader
;
1653 int in_vain
= 0, negotiation_started
= 0;
1654 int negotiation_round
= 0;
1655 int haves_to_send
= INITIAL_FLUSH
;
1656 struct fetch_negotiator negotiator_alloc
;
1657 struct fetch_negotiator
*negotiator
;
1659 struct object_id common_oid
;
1660 int received_ready
= 0;
1661 struct string_list packfile_uris
= STRING_LIST_INIT_DUP
;
1663 struct strvec index_pack_args
= STRVEC_INIT
;
1665 negotiator
= &negotiator_alloc
;
1667 fetch_negotiator_init_noop(negotiator
);
1669 fetch_negotiator_init(r
, negotiator
);
1671 packet_reader_init(&reader
, fd
[0], NULL
, 0,
1672 PACKET_READ_CHOMP_NEWLINE
|
1673 PACKET_READ_DIE_ON_ERR_PACKET
);
1674 if (git_env_bool("GIT_TEST_SIDEBAND_ALL", 1) &&
1675 server_supports_feature("fetch", "sideband-all", 0)) {
1676 reader
.use_sideband
= 1;
1677 reader
.me
= "fetch-pack";
1680 while (state
!= FETCH_DONE
) {
1682 case FETCH_CHECK_LOCAL
:
1683 sort_ref_list(&ref
, ref_compare_name
);
1684 QSORT(sought
, nr_sought
, cmp_ref_by_name
);
1686 /* v2 supports these by default */
1687 allow_unadvertised_object_request
|= ALLOW_REACHABLE_SHA1
;
1689 if (args
->depth
> 0 || args
->deepen_since
|| args
->deepen_not
)
1692 /* Filter 'ref' by 'sought' and those that aren't local */
1693 mark_complete_and_common_ref(negotiator
, args
, &ref
);
1694 filter_refs(args
, &ref
, sought
, nr_sought
);
1695 if (!args
->refetch
&& everything_local(args
, &ref
))
1698 state
= FETCH_SEND_REQUEST
;
1700 mark_tips(negotiator
, args
->negotiation_tips
);
1701 for_each_cached_alternate(negotiator
,
1702 insert_one_alternate_object
);
1704 case FETCH_SEND_REQUEST
:
1705 if (!negotiation_started
) {
1706 negotiation_started
= 1;
1707 trace2_region_enter("fetch-pack",
1711 negotiation_round
++;
1712 trace2_region_enter_printf("negotiation_v2", "round",
1713 the_repository
, "%d",
1715 if (send_fetch_request(negotiator
, fd
[1], args
, ref
,
1717 &haves_to_send
, &in_vain
,
1718 reader
.use_sideband
,
1720 trace2_region_leave_printf("negotiation_v2", "round",
1721 the_repository
, "%d",
1723 state
= FETCH_GET_PACK
;
1726 state
= FETCH_PROCESS_ACKS
;
1728 case FETCH_PROCESS_ACKS
:
1729 /* Process ACKs/NAKs */
1730 process_section_header(&reader
, "acknowledgments", 0);
1731 while (process_ack(negotiator
, &reader
, &common_oid
,
1735 oidset_insert(&common
, &common_oid
);
1737 trace2_region_leave_printf("negotiation_v2", "round",
1738 the_repository
, "%d",
1740 if (received_ready
) {
1742 * Don't check for response delimiter; get_pack() will
1743 * read the rest of this response.
1745 state
= FETCH_GET_PACK
;
1747 do_check_stateless_delimiter(args
->stateless_rpc
, &reader
);
1748 state
= FETCH_SEND_REQUEST
;
1751 case FETCH_GET_PACK
:
1752 trace2_region_leave("fetch-pack",
1755 trace2_data_intmax("negotiation_v2", the_repository
,
1756 "total_rounds", negotiation_round
);
1757 /* Check for shallow-info section */
1758 if (process_section_header(&reader
, "shallow-info", 1))
1759 receive_shallow_info(args
, &reader
, shallows
, si
);
1761 if (process_section_header(&reader
, "wanted-refs", 1))
1762 receive_wanted_refs(&reader
, sought
, nr_sought
);
1764 /* get the pack(s) */
1765 if (git_env_bool("GIT_TRACE_REDACT", 1))
1766 reader
.options
|= PACKET_READ_REDACT_URI_PATH
;
1767 if (process_section_header(&reader
, "packfile-uris", 1))
1768 receive_packfile_uris(&reader
, &packfile_uris
);
1769 /* We don't expect more URIs. Reset to avoid expensive URI check. */
1770 reader
.options
&= ~PACKET_READ_REDACT_URI_PATH
;
1772 process_section_header(&reader
, "packfile", 0);
1775 * this is the final request we'll make of the server;
1776 * do a half-duplex shutdown to indicate that they can
1777 * hang up as soon as the pack is sent.
1782 if (get_pack(args
, fd
, pack_lockfiles
,
1783 packfile_uris
.nr
? &index_pack_args
: NULL
,
1784 sought
, nr_sought
, &fsck_options
.gitmodules_found
))
1785 die(_("git fetch-pack: fetch failed."));
1786 do_check_stateless_delimiter(args
->stateless_rpc
, &reader
);
1795 for (i
= 0; i
< packfile_uris
.nr
; i
++) {
1797 struct child_process cmd
= CHILD_PROCESS_INIT
;
1798 char packname
[GIT_MAX_HEXSZ
+ 1];
1799 const char *uri
= packfile_uris
.items
[i
].string
+
1800 the_hash_algo
->hexsz
+ 1;
1802 strvec_push(&cmd
.args
, "http-fetch");
1803 strvec_pushf(&cmd
.args
, "--packfile=%.*s",
1804 (int) the_hash_algo
->hexsz
,
1805 packfile_uris
.items
[i
].string
);
1806 for (j
= 0; j
< index_pack_args
.nr
; j
++)
1807 strvec_pushf(&cmd
.args
, "--index-pack-arg=%s",
1808 index_pack_args
.v
[j
]);
1809 strvec_push(&cmd
.args
, uri
);
1813 if (start_command(&cmd
))
1814 die("fetch-pack: unable to spawn http-fetch");
1816 if (read_in_full(cmd
.out
, packname
, 5) < 0 ||
1817 memcmp(packname
, "keep\t", 5))
1818 die("fetch-pack: expected keep then TAB at start of http-fetch output");
1820 if (read_in_full(cmd
.out
, packname
,
1821 the_hash_algo
->hexsz
+ 1) < 0 ||
1822 packname
[the_hash_algo
->hexsz
] != '\n')
1823 die("fetch-pack: expected hash then LF at end of http-fetch output");
1825 packname
[the_hash_algo
->hexsz
] = '\0';
1827 parse_gitmodules_oids(cmd
.out
, &fsck_options
.gitmodules_found
);
1831 if (finish_command(&cmd
))
1832 die("fetch-pack: unable to finish http-fetch");
1834 if (memcmp(packfile_uris
.items
[i
].string
, packname
,
1835 the_hash_algo
->hexsz
))
1836 die("fetch-pack: pack downloaded from %s does not match expected hash %.*s",
1837 uri
, (int) the_hash_algo
->hexsz
,
1838 packfile_uris
.items
[i
].string
);
1840 string_list_append_nodup(pack_lockfiles
,
1841 xstrfmt("%s/pack/pack-%s.keep",
1842 get_object_directory(),
1845 string_list_clear(&packfile_uris
, 0);
1846 strvec_clear(&index_pack_args
);
1848 if (fsck_finish(&fsck_options
))
1852 negotiator
->release(negotiator
);
1854 oidset_clear(&common
);
1858 static int fetch_pack_config_cb(const char *var
, const char *value
,
1859 const struct config_context
*ctx
, 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.", &msg_id
)) {
1876 return config_error_nonbool(var
);
1877 if (is_valid_msg_type(msg_id
, value
))
1878 strbuf_addf(&fsck_msg_types
, "%c%s=%s",
1879 fsck_msg_types
.len
? ',' : '=', msg_id
, value
);
1881 warning("Skipping unknown msg id '%s'", msg_id
);
1885 return git_default_config(var
, value
, ctx
, cb
);
1888 static void fetch_pack_config(void)
1890 git_config_get_int("fetch.unpacklimit", &fetch_unpack_limit
);
1891 git_config_get_int("transfer.unpacklimit", &transfer_unpack_limit
);
1892 git_config_get_bool("repack.usedeltabaseoffset", &prefer_ofs_delta
);
1893 git_config_get_bool("fetch.fsckobjects", &fetch_fsck_objects
);
1894 git_config_get_bool("transfer.fsckobjects", &transfer_fsck_objects
);
1895 git_config_get_bool("transfer.advertisesid", &advertise_sid
);
1896 if (!uri_protocols
.nr
) {
1899 if (!git_config_get_string("fetch.uriprotocols", &str
) && str
) {
1900 string_list_split(&uri_protocols
, str
, ',', -1);
1905 git_config(fetch_pack_config_cb
, NULL
);
1908 static void fetch_pack_setup(void)
1910 static int did_setup
;
1913 fetch_pack_config();
1914 if (0 <= fetch_unpack_limit
)
1915 unpack_limit
= fetch_unpack_limit
;
1916 else if (0 <= transfer_unpack_limit
)
1917 unpack_limit
= transfer_unpack_limit
;
1921 static int remove_duplicates_in_refs(struct ref
**ref
, int nr
)
1923 struct string_list names
= STRING_LIST_INIT_NODUP
;
1926 for (src
= dst
= 0; src
< nr
; src
++) {
1927 struct string_list_item
*item
;
1928 item
= string_list_insert(&names
, ref
[src
]->name
);
1930 continue; /* already have it */
1931 item
->util
= ref
[src
];
1933 ref
[dst
] = ref
[src
];
1936 for (src
= dst
; src
< nr
; src
++)
1938 string_list_clear(&names
, 0);
1942 static void update_shallow(struct fetch_pack_args
*args
,
1943 struct ref
**sought
, int nr_sought
,
1944 struct shallow_info
*si
)
1946 struct oid_array ref
= OID_ARRAY_INIT
;
1950 if (args
->deepen
&& alternate_shallow_file
) {
1951 if (*alternate_shallow_file
== '\0') { /* --unshallow */
1952 unlink_or_warn(git_path_shallow(the_repository
));
1953 rollback_shallow_file(the_repository
, &shallow_lock
);
1955 commit_shallow_file(the_repository
, &shallow_lock
);
1956 alternate_shallow_file
= NULL
;
1960 if (!si
->shallow
|| !si
->shallow
->nr
)
1963 if (args
->cloning
) {
1965 * remote is shallow, but this is a clone, there are
1966 * no objects in repo to worry about. Accept any
1967 * shallow points that exist in the pack (iow in repo
1968 * after get_pack() and reprepare_packed_git())
1970 struct oid_array extra
= OID_ARRAY_INIT
;
1971 struct object_id
*oid
= si
->shallow
->oid
;
1972 for (i
= 0; i
< si
->shallow
->nr
; i
++)
1973 if (repo_has_object_file(the_repository
, &oid
[i
]))
1974 oid_array_append(&extra
, &oid
[i
]);
1976 setup_alternate_shallow(&shallow_lock
,
1977 &alternate_shallow_file
,
1979 commit_shallow_file(the_repository
, &shallow_lock
);
1980 alternate_shallow_file
= NULL
;
1982 oid_array_clear(&extra
);
1986 if (!si
->nr_ours
&& !si
->nr_theirs
)
1989 remove_nonexistent_theirs_shallow(si
);
1990 if (!si
->nr_ours
&& !si
->nr_theirs
)
1992 for (i
= 0; i
< nr_sought
; i
++)
1993 oid_array_append(&ref
, &sought
[i
]->old_oid
);
1996 if (args
->update_shallow
) {
1998 * remote is also shallow, .git/shallow may be updated
1999 * so all refs can be accepted. Make sure we only add
2000 * shallow roots that are actually reachable from new
2003 struct oid_array extra
= OID_ARRAY_INIT
;
2004 struct object_id
*oid
= si
->shallow
->oid
;
2005 assign_shallow_commits_to_refs(si
, NULL
, NULL
);
2006 if (!si
->nr_ours
&& !si
->nr_theirs
) {
2007 oid_array_clear(&ref
);
2010 for (i
= 0; i
< si
->nr_ours
; i
++)
2011 oid_array_append(&extra
, &oid
[si
->ours
[i
]]);
2012 for (i
= 0; i
< si
->nr_theirs
; i
++)
2013 oid_array_append(&extra
, &oid
[si
->theirs
[i
]]);
2014 setup_alternate_shallow(&shallow_lock
,
2015 &alternate_shallow_file
,
2017 commit_shallow_file(the_repository
, &shallow_lock
);
2018 oid_array_clear(&extra
);
2019 oid_array_clear(&ref
);
2020 alternate_shallow_file
= NULL
;
2025 * remote is also shallow, check what ref is safe to update
2026 * without updating .git/shallow
2028 CALLOC_ARRAY(status
, nr_sought
);
2029 assign_shallow_commits_to_refs(si
, NULL
, status
);
2030 if (si
->nr_ours
|| si
->nr_theirs
) {
2031 for (i
= 0; i
< nr_sought
; i
++)
2033 sought
[i
]->status
= REF_STATUS_REJECT_SHALLOW
;
2036 oid_array_clear(&ref
);
2039 static const struct object_id
*iterate_ref_map(void *cb_data
)
2041 struct ref
**rm
= cb_data
;
2042 struct ref
*ref
= *rm
;
2047 return &ref
->old_oid
;
2050 int fetch_pack_fsck_objects(void)
2053 if (fetch_fsck_objects
>= 0)
2054 return fetch_fsck_objects
;
2055 if (transfer_fsck_objects
>= 0)
2056 return transfer_fsck_objects
;
2060 struct ref
*fetch_pack(struct fetch_pack_args
*args
,
2062 const struct ref
*ref
,
2063 struct ref
**sought
, int nr_sought
,
2064 struct oid_array
*shallow
,
2065 struct string_list
*pack_lockfiles
,
2066 enum protocol_version version
)
2068 struct ref
*ref_cpy
;
2069 struct shallow_info si
;
2070 struct oid_array shallows_scratch
= OID_ARRAY_INIT
;
2074 nr_sought
= remove_duplicates_in_refs(sought
, nr_sought
);
2076 if (version
!= protocol_v2
&& !ref
) {
2077 packet_flush(fd
[1]);
2078 die(_("no matching remote head"));
2080 if (version
== protocol_v2
) {
2082 BUG("Protocol V2 does not provide shallows at this point in the fetch");
2083 memset(&si
, 0, sizeof(si
));
2084 ref_cpy
= do_fetch_pack_v2(args
, fd
, ref
, sought
, nr_sought
,
2085 &shallows_scratch
, &si
,
2088 prepare_shallow_info(&si
, shallow
);
2089 ref_cpy
= do_fetch_pack(args
, fd
, ref
, sought
, nr_sought
,
2090 &si
, pack_lockfiles
);
2092 reprepare_packed_git(the_repository
);
2094 if (!args
->cloning
&& args
->deepen
) {
2095 struct check_connected_options opt
= CHECK_CONNECTED_INIT
;
2096 struct ref
*iterator
= ref_cpy
;
2097 opt
.shallow_file
= alternate_shallow_file
;
2099 opt
.is_deepening_fetch
= 1;
2100 if (check_connected(iterate_ref_map
, &iterator
, &opt
)) {
2101 error(_("remote did not send all necessary objects"));
2104 rollback_shallow_file(the_repository
, &shallow_lock
);
2107 args
->connectivity_checked
= 1;
2110 update_shallow(args
, sought
, nr_sought
, &si
);
2112 clear_shallow_info(&si
);
2113 oid_array_clear(&shallows_scratch
);
2117 static int add_to_object_array(const struct object_id
*oid
, void *data
)
2119 struct object_array
*a
= data
;
2121 add_object_array(lookup_object(the_repository
, oid
), "", a
);
2125 static void clear_common_flag(struct oidset
*s
)
2127 struct oidset_iter iter
;
2128 const struct object_id
*oid
;
2129 oidset_iter_init(s
, &iter
);
2131 while ((oid
= oidset_iter_next(&iter
))) {
2132 struct object
*obj
= lookup_object(the_repository
, oid
);
2133 obj
->flags
&= ~COMMON
;
2137 void negotiate_using_fetch(const struct oid_array
*negotiation_tips
,
2138 const struct string_list
*server_options
,
2141 struct oidset
*acked_commits
)
2143 struct fetch_negotiator negotiator
;
2144 struct packet_reader reader
;
2145 struct object_array nt_object_array
= OBJECT_ARRAY_INIT
;
2146 struct strbuf req_buf
= STRBUF_INIT
;
2147 int haves_to_send
= INITIAL_FLUSH
;
2150 int last_iteration
= 0;
2151 int negotiation_round
= 0;
2152 timestamp_t min_generation
= GENERATION_NUMBER_INFINITY
;
2154 fetch_negotiator_init(the_repository
, &negotiator
);
2155 mark_tips(&negotiator
, negotiation_tips
);
2157 packet_reader_init(&reader
, fd
[0], NULL
, 0,
2158 PACKET_READ_CHOMP_NEWLINE
|
2159 PACKET_READ_DIE_ON_ERR_PACKET
);
2161 oid_array_for_each((struct oid_array
*) negotiation_tips
,
2162 add_to_object_array
,
2165 trace2_region_enter("fetch-pack", "negotiate_using_fetch", the_repository
);
2166 while (!last_iteration
) {
2168 struct object_id common_oid
;
2169 int received_ready
= 0;
2171 negotiation_round
++;
2173 trace2_region_enter_printf("negotiate_using_fetch", "round",
2174 the_repository
, "%d",
2176 strbuf_reset(&req_buf
);
2177 write_fetch_command_and_capabilities(&req_buf
, server_options
);
2179 packet_buf_write(&req_buf
, "wait-for-done");
2181 haves_added
= add_haves(&negotiator
, &req_buf
, &haves_to_send
);
2182 in_vain
+= haves_added
;
2183 if (!haves_added
|| (seen_ack
&& in_vain
>= MAX_IN_VAIN
))
2186 trace2_data_intmax("negotiate_using_fetch", the_repository
,
2187 "haves_added", haves_added
);
2188 trace2_data_intmax("negotiate_using_fetch", the_repository
,
2189 "in_vain", in_vain
);
2192 packet_buf_flush(&req_buf
);
2193 if (write_in_full(fd
[1], req_buf
.buf
, req_buf
.len
) < 0)
2194 die_errno(_("unable to write request to remote"));
2196 /* Process ACKs/NAKs */
2197 process_section_header(&reader
, "acknowledgments", 0);
2198 while (process_ack(&negotiator
, &reader
, &common_oid
,
2200 struct commit
*commit
= lookup_commit(the_repository
,
2203 timestamp_t generation
;
2205 parse_commit_or_die(commit
);
2206 commit
->object
.flags
|= COMMON
;
2207 generation
= commit_graph_generation(commit
);
2208 if (generation
< min_generation
)
2209 min_generation
= generation
;
2213 oidset_insert(acked_commits
, &common_oid
);
2216 die(_("unexpected 'ready' from remote"));
2218 do_check_stateless_delimiter(stateless_rpc
, &reader
);
2219 if (can_all_from_reach_with_flag(&nt_object_array
, COMMON
,
2223 trace2_region_leave_printf("negotiation", "round",
2224 the_repository
, "%d",
2227 trace2_region_leave("fetch-pack", "negotiate_using_fetch", the_repository
);
2228 trace2_data_intmax("negotiate_using_fetch", the_repository
,
2229 "total_rounds", negotiation_round
);
2230 clear_common_flag(acked_commits
);
2231 strbuf_release(&req_buf
);
2234 int report_unmatched_refs(struct ref
**sought
, int nr_sought
)
2238 for (i
= 0; i
< nr_sought
; i
++) {
2241 switch (sought
[i
]->match_status
) {
2244 case REF_NOT_MATCHED
:
2245 error(_("no such remote ref %s"), sought
[i
]->name
);
2247 case REF_UNADVERTISED_NOT_ALLOWED
:
2248 error(_("Server does not allow request for unadvertised object %s"),