зеркало из https://github.com/microsoft/git.git
transport: do not list refs if possible
When all refs to be fetched are exact OIDs, it is possible to perform a fetch without requiring the remote to list refs if protocol v2 is used. Teach Git to do this. This currently has an effect only for lazy fetches done from partial clones. The change necessary to likewise optimize "git fetch <remote> <sha-1>" will be done in a subsequent patch. Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
99bcb883cb
Коммит
0177565148
|
@ -1598,7 +1598,7 @@ struct ref *fetch_pack(struct fetch_pack_args *args,
|
|||
if (nr_sought)
|
||||
nr_sought = remove_duplicates_in_refs(sought, nr_sought);
|
||||
|
||||
if (!ref) {
|
||||
if (version != protocol_v2 && !ref) {
|
||||
packet_flush(fd[1]);
|
||||
die(_("no matching remote head"));
|
||||
}
|
||||
|
|
|
@ -286,6 +286,10 @@ test_expect_success 'dynamically fetch missing object' '
|
|||
grep "version 2" trace
|
||||
'
|
||||
|
||||
test_expect_success 'when dynamically fetching missing object, do not list refs' '
|
||||
! grep "git> command=ls-refs" trace
|
||||
'
|
||||
|
||||
test_expect_success 'partial fetch' '
|
||||
rm -rf client "$(pwd)/trace" &&
|
||||
git init client &&
|
||||
|
|
13
transport.c
13
transport.c
|
@ -341,8 +341,17 @@ static int fetch_refs_via_pack(struct transport *transport,
|
|||
args.server_options = transport->server_options;
|
||||
args.negotiation_tips = data->options.negotiation_tips;
|
||||
|
||||
if (!data->got_remote_heads)
|
||||
refs_tmp = get_refs_via_connect(transport, 0, NULL);
|
||||
if (!data->got_remote_heads) {
|
||||
int i;
|
||||
int must_list_refs = 0;
|
||||
for (i = 0; i < nr_heads; i++) {
|
||||
if (!to_fetch[i]->exact_oid) {
|
||||
must_list_refs = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
refs_tmp = handshake(transport, 0, NULL, must_list_refs);
|
||||
}
|
||||
|
||||
switch (data->version) {
|
||||
case protocol_v2:
|
||||
|
|
Загрузка…
Ссылка в новой задаче