From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 Jul 2026 17:44:35 +0000 (-0700)
Subject: Merge branch 'js/pack-objects-delta-size-t' into seen
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b49414af738f2c5301fe585416427ff497065752;p=thirdparty%2Fgit.git

Merge branch 'js/pack-objects-delta-size-t' into seen

The 'pack-objects' and delta-encoding code paths have been updated to
use 'size_t' instead of 'unsigned long' for object sizes and offset
limits, avoiding potential truncation issues on 64-bit Windows.

* js/pack-objects-delta-size-t:
  git-zlib: widen `git_deflate_bound()` to `size_t`
  t/helper/test-pack-deltas: widen `do_compress()`'s maxsize local to `size_t`
  http-push: widen `start_put()`'s size local from `ssize_t` to `size_t`
  diff: widen `deflate_it()`'s bound local from int to `size_t`
  archive-zip: widen `zlib_deflate_raw()`'s maxsize local to `size_t`
  packfile, git-zlib: widen `use_pack()` and zstream avail fields to `size_t`
  delta: widen `create_delta()` and `diff_delta()` to `size_t`
  pack-objects: widen `mem_usage` and `try_delta()`'s out-param to `size_t`
  pack-objects: widen `free_unpacked()` return to `size_t`
  pack-objects: widen delta-cache accounting to `size_t`
  delta: widen `create_delta_index()` parameter to `size_t`
  diff-delta: widen `struct delta_index`' size fields to `size_t`
---

b49414af738f2c5301fe585416427ff497065752
diff --cc pack-check.c
index c3b8db7c5c,befb860472..b18afcce26
--- a/pack-check.c
+++ b/pack-check.c
@@@ -69,9 -69,9 +69,9 @@@ static int verify_packfile(struct repos
  	if (!is_pack_valid(p))
  		return error("packfile %s cannot be accessed", p->pack_name);
  
 -	r->hash_algo->init_fn(&ctx);
 +	git_hash_init(&ctx, r->hash_algo);
  	do {
- 		unsigned long remaining;
+ 		size_t remaining;
  		unsigned char *in = use_pack(p, w_curs, offset, &remaining);
  		offset += remaining;
  		if (!pack_sig_ofs)