From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Nov 2021 23:41:51 +0000 (-0800)
Subject: Merge branch 'mc/clean-smudge-with-llp64'
X-Git-Tag: v2.35.0-rc0~127
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f9ba6acaa9348ea7b733bf78adc2f084247a912f;p=thirdparty%2Fgit.git

Merge branch 'mc/clean-smudge-with-llp64'

The clean/smudge conversion code path has been prepared to better
work on platforms where ulong is narrower than size_t.

* mc/clean-smudge-with-llp64:
  clean/smudge: allow clean filters to process extremely large files
  odb: guard against data loss checking out a huge file
  git-compat-util: introduce more size_t helpers
  odb: teach read_blob_entry to use size_t
  t1051: introduce a smudge filter test for extremely large files
  test-lib: add prerequisite for 64-bit platforms
  test-tool genzeros: generate large amounts of data more efficiently
  test-genzeros: allow more than 2G zeros in Windows
---

f9ba6acaa9348ea7b733bf78adc2f084247a912f
diff --cc object-file.c
index c3d866a287,70e456fc2a..eb972cdccd
--- a/object-file.c
+++ b/object-file.c
@@@ -1303,10 -1340,11 +1303,10 @@@ static void *unpack_loose_rest(git_zstr
   * too permissive for what we want to check. So do an anal
   * object header parse by hand.
   */
 -static int parse_loose_header_extended(const char *hdr, struct object_info *oi,
 -				       unsigned int flags)
 +int parse_loose_header(const char *hdr, struct object_info *oi)
  {
  	const char *type_buf = hdr;
- 	unsigned long size;
+ 	size_t size;
  	int type, type_len = 0;
  
  	/*