]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'mc/clean-smudge-with-llp64'
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Nov 2021 23:41:51 +0000 (15:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Nov 2021 23:41:51 +0000 (15:41 -0800)
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

1  2 
convert.c
entry.c
entry.h
git-compat-util.h
object-file.c
packfile.c
parallel-checkout.c
t/test-lib.sh

diff --cc convert.c
Simple merge
diff --cc entry.c
Simple merge
diff --cc entry.h
Simple merge
Simple merge
diff --cc object-file.c
index c3d866a287e03ad0ae5de97ab6a352887c92e233,70e456fc2a3c96a15d384da35f9aa7ea5666de47..eb972cdccd2c2359b05a333e8b70725c5710cea2
@@@ -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;
  
        /*
diff --cc packfile.c
Simple merge
Simple merge
diff --cc t/test-lib.sh
Simple merge