]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/protocol-cap-parse-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 25 Apr 2023 20:56:20 +0000 (13:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 25 Apr 2023 20:56:20 +0000 (13:56 -0700)
The code to parse capability list for v0 on-wire protocol fell into
an infinite loop when a capability appears multiple times, which
has been corrected.

* jk/protocol-cap-parse-fix:
  v0 protocol: use size_t for capability length/offset
  t5512: test "ls-remote --heads --symref" filtering with v0 and v2
  t5512: allow any protocol version for filtered symref test
  t5512: add v2 support for "ls-remote --symref" test
  v0 protocol: fix sha1/sha256 confusion for capabilities^{}
  t5512: stop referring to "v1" protocol
  v0 protocol: fix infinite loop when parsing multi-valued capabilities

1  2 
builtin/receive-pack.c
connect.c
fetch-pack.c
send-pack.c
transport.c
upload-pack.c

Simple merge
diff --cc connect.c
Simple merge
diff --cc fetch-pack.c
Simple merge
diff --cc send-pack.c
Simple merge
diff --cc transport.c
Simple merge
diff --cc upload-pack.c
Simple merge