mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ts/unpacklimit-config-fix' into next

Browse Source 
transfer.unpackLimit ought to be used as a fallback, but overrode
fetch.unpackLimit and receive.unpackLimit instead.

* ts/unpacklimit-config-fix:
  transfer.unpackLimit: fetch/receive.unpackLimit takes precedence
This commit is contained in:
Junio C Hamano
2023-08-23 19:41:21 -07:00
parent 436a0aec3d f3d33f8cfe
commit 4fabd9a697
4 changed files with 84 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/receive-pack.c
View File

@ -2527,10 +2527,10 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
if (cert_nonce_seed)
push_cert_nonce = prepare_push_cert_nonce(service_dir, time(NULL));
if (0 <= transfer_unpack_limit)
unpack_limit = transfer_unpack_limit;
else if (0 <= receive_unpack_limit)
if (0 <= receive_unpack_limit)
unpack_limit = receive_unpack_limit;
else if (0 <= transfer_unpack_limit)
unpack_limit = transfer_unpack_limit;
switch (determine_protocol_version_server()) {
case protocol_v2: