summaryrefslogtreecommitdiff
path: root/parallel-checkout.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-11-29 23:41:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-11-29 23:41:51 (GMT)
commitf9ba6acaa9348ea7b733bf78adc2f084247a912f (patch)
treebd702b925cea098b8e04bd49272c5faba336bf15 /parallel-checkout.c
parentad1260b6c994f7c0f9c259bd39f39979f7f4ecc2 (diff)
parent596b5e77c960cc57ad2e68407b298411ec5e8cb8 (diff)
downloadgit-f9ba6acaa9348ea7b733bf78adc2f084247a912f.zip
git-f9ba6acaa9348ea7b733bf78adc2f084247a912f.tar.gz
git-f9ba6acaa9348ea7b733bf78adc2f084247a912f.tar.bz2
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 'parallel-checkout.c')
-rw-r--r--parallel-checkout.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/parallel-checkout.c b/parallel-checkout.c
index ed9c999..8dd7e7b 100644
--- a/parallel-checkout.c
+++ b/parallel-checkout.c
@@ -261,7 +261,7 @@ static int write_pc_item_to_fd(struct parallel_checkout_item *pc_item, int fd,
struct stream_filter *filter;
struct strbuf buf = STRBUF_INIT;
char *blob;
- unsigned long size;
+ size_t size;
ssize_t wrote;
/* Sanity check */