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

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
4 changed files with 84 additions and 9 deletions

View File

@ -1911,10 +1911,10 @@ static void fetch_pack_setup(void)
if (did_setup)
return;
fetch_pack_config();
if (0 <= transfer_unpack_limit)
unpack_limit = transfer_unpack_limit;
else if (0 <= fetch_unpack_limit)
if (0 <= fetch_unpack_limit)
unpack_limit = fetch_unpack_limit;
else if (0 <= transfer_unpack_limit)
unpack_limit = transfer_unpack_limit;
did_setup = 1;
}