From ef24de24a82fe681581cc130f342363c47c0969a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 7 Jun 2024 07:48:48 +0200 Subject: Merging upstream version 1.75.0+dfsg1. Signed-off-by: Daniel Baumann --- vendor/gix-pack/src/data/input/entries_to_bytes.rs | 2 +- vendor/gix-pack/src/verify.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'vendor/gix-pack/src') diff --git a/vendor/gix-pack/src/data/input/entries_to_bytes.rs b/vendor/gix-pack/src/data/input/entries_to_bytes.rs index 27cd04648..dc2ac5884 100644 --- a/vendor/gix-pack/src/data/input/entries_to_bytes.rs +++ b/vendor/gix-pack/src/data/input/entries_to_bytes.rs @@ -97,7 +97,7 @@ where let interrupt_never = std::sync::atomic::AtomicBool::new(false); let digest = hash::bytes( &mut self.output, - num_bytes_written as usize, + num_bytes_written, self.object_hash, &mut gix_features::progress::Discard, &interrupt_never, diff --git a/vendor/gix-pack/src/verify.rs b/vendor/gix-pack/src/verify.rs index d502ada38..fff99c75d 100644 --- a/vendor/gix-pack/src/verify.rs +++ b/vendor/gix-pack/src/verify.rs @@ -39,7 +39,7 @@ pub fn checksum_on_disk_or_mmap( let data_len_without_trailer = data.len() - object_hash.len_in_bytes(); let actual = match gix_features::hash::bytes_of_file( data_path, - data_len_without_trailer, + data_len_without_trailer as u64, object_hash, progress, should_interrupt, -- cgit v1.2.3