]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'js/objects-larger-than-4gb-on-windows-more'
authorJunio C Hamano <gitster@pobox.com>
Sun, 21 Jun 2026 23:41:37 +0000 (16:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 21 Jun 2026 23:41:38 +0000 (16:41 -0700)
* js/objects-larger-than-4gb-on-windows-more:
  odb: use size_t for object_info.sizep and the size APIs
  packfile,delta: drop the `cast_size_t_to_ulong()` wrappers
  pack-objects: use size_t for in-core object sizes
  packfile: widen unpack_entry()'s size out-parameter to size_t
  pack-objects(check_pack_inflate()): use size_t instead of unsigned long
  patch-delta: use size_t for sizes
  compat/msvc: use _chsize_s for ftruncate

16 files changed:
1  2 
builtin/cat-file.c
builtin/fast-import.c
builtin/index-pack.c
builtin/ls-files.c
builtin/pack-objects.c
combine-diff.c
commit.c
config.c
diff.c
dir.c
entry.c
http-push.c
object-file.c
odb.h
packfile.h
rerere.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc combine-diff.c
Simple merge
diff --cc commit.c
Simple merge
diff --cc config.c
Simple merge
diff --cc diff.c
Simple merge
diff --cc dir.c
Simple merge
diff --cc entry.c
Simple merge
diff --cc http-push.c
Simple merge
diff --cc object-file.c
Simple merge
diff --cc odb.h
Simple merge
diff --cc packfile.h
Simple merge
diff --cc rerere.c
Simple merge