kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jt/fetch-pack-v2' 

"git fetch-pack" now can talk the version 2 protocol.

* jt/fetch-pack-v2:
  fetch-pack: support protocol version 2
maint
Junio C Hamano 2019-01-29 12:47:54 -08:00
parent d3b017822d 4316ff3068
commit f33989464e
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builtin/fetch-pack.c
View File

@ -55,6 +55,7 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
struct oid_array shallow = OID_ARRAY_INIT; struct oid_array shallow = OID_ARRAY_INIT;
struct string_list deepen_not = STRING_LIST_INIT_DUP; struct string_list deepen_not = STRING_LIST_INIT_DUP;
struct packet_reader reader; struct packet_reader reader;
enum protocol_version version;


fetch_if_missing = 0; fetch_if_missing = 0;


@ -219,9 +220,11 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
PACKET_READ_CHOMP_NEWLINE | PACKET_READ_CHOMP_NEWLINE |
PACKET_READ_GENTLE_ON_EOF); PACKET_READ_GENTLE_ON_EOF);


switch (discover_version(&reader)) { version = discover_version(&reader);
switch (version) {
case protocol_v2: case protocol_v2:
die("support for protocol v2 not implemented yet"); get_remote_refs(fd[1], &reader, &ref, 0, NULL, NULL);
break;
case protocol_v1: case protocol_v1:
case protocol_v0: case protocol_v0:
get_remote_heads(&reader, &ref, 0, NULL, &shallow); get_remote_heads(&reader, &ref, 0, NULL, &shallow);
@ -231,7 +234,7 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
} }


ref = fetch_pack(&args, fd, conn, ref, dest, sought, nr_sought, ref = fetch_pack(&args, fd, conn, ref, dest, sought, nr_sought,
&shallow, pack_lockfile_ptr, protocol_v0); &shallow, pack_lockfile_ptr, version);
if (pack_lockfile) { if (pack_lockfile) {
printf("lock %s\n", pack_lockfile); printf("lock %s\n", pack_lockfile);
fflush(stdout); fflush(stdout);

22
t/t5500-fetch-pack.sh
View File

@ -439,15 +439,23 @@ test_expect_success 'setup tests for the --stdin parameter' '
) >input.dup ) >input.dup
' '


test_expect_success 'fetch refs from cmdline' ' test_expect_success 'setup fetch refs from cmdline v[12]' '
( cp -r client client1 &&
cd client && cp -r client client2
git fetch-pack --no-progress .. $(cat ../input)
) >output &&
cut -d " " -f 2 <output | sort >actual &&
test_cmp expect actual
' '


for version in '' 1 2
do
test_expect_success "protocol.version=$version fetch refs from cmdline" "
(
cd client$version &&
GIT_TEST_PROTOCOL_VERSION=$version git fetch-pack --no-progress .. \$(cat ../input)
) >output &&
cut -d ' ' -f 2 <output | sort >actual &&
test_cmp expect actual
"
done

test_expect_success 'fetch refs from stdin' ' test_expect_success 'fetch refs from stdin' '
( (
cd client && cd client &&