diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-08-30 23:50:41 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-08-30 23:50:41 +0300 |
| commit | cc48906c3b0ce0cb472b6c97fa66fa2d396b59e4 (patch) | |
| tree | 1a56bee71c98fad53c435df998f21cdc713cc2a6 /fetch-pack.c | |
| parent | 74a2e88700efc2f1874967e7f007723d0865ac1b (diff) | |
| parent | f3d33f8cfeac8a2a00b4f87eec48dbca1d3080e0 (diff) | |
Merge branch 'ts/unpacklimit-config-fix'
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
Diffstat (limited to 'fetch-pack.c')
| -rw-r--r-- | fetch-pack.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fetch-pack.c b/fetch-pack.c index 65c1ff4bb4..26999e3b65 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -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; } |