diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-11-29 15:41:51 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-11-29 15:41:51 -0800 |
commit | f9ba6acaa9348ea7b733bf78adc2f084247a912f (patch) | |
tree | bd702b925cea098b8e04bd49272c5faba336bf15 /convert.c | |
parent | Merge branch 'ab/sh-retire-helper-functions' (diff) | |
parent | clean/smudge: allow clean filters to process extremely large files (diff) | |
download | tgif-f9ba6acaa9348ea7b733bf78adc2f084247a912f.tar.xz |
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
Diffstat (limited to 'convert.c')
-rw-r--r-- | convert.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -613,7 +613,7 @@ static int crlf_to_worktree(const char *src, size_t len, struct strbuf *buf, struct filter_params { const char *src; - unsigned long size; + size_t size; int fd; const char *cmd; const char *path; |