specify the hash to create with 'hash::bytes_of_file'

Author: Byron

git-features/src/hash.rs

@@ -46,9 +46,12 @@ pub use crc::crc32::checksum_ieee as crc32;
 pub fn bytes_of_file(
     path: impl AsRef<std::path::Path>,
     num_bytes_from_start: usize,
+    kind: git_object::HashKind,
     progress: &mut impl crate::progress::Progress,
 ) -> std::io::Result<git_object::owned::Id> {
-    let mut hasher = crate::hash::Sha1::default();
+    let mut hasher = match kind {
+        git_object::HashKind::Sha1 => crate::hash::Sha1::default(),
+    };
     let start = std::time::Instant::now();
     // init progress before the possibility for failure, as convenience in case people want to recover
     progress.init(Some(num_bytes_from_start), crate::progress::bytes());

git-odb/src/pack/data/verify.rs

@@ -1,6 +1,6 @@
 use crate::pack::data::File;
 use git_features::progress::Progress;
-use git_object::{owned, SHA1_SIZE};
+use git_object::{owned, HashKind, SHA1_SIZE};
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
@@ -17,17 +17,18 @@ impl File {
     }
     pub fn verify_checksum(&self, mut progress: impl Progress) -> Result<owned::Id, Error> {
         let right_before_trailer = self.data.len() - SHA1_SIZE;
-        let actual = match git_features::hash::bytes_of_file(&self.path, right_before_trailer, &mut progress) {
-            Ok(id) => id,
-            Err(_io_err) => {
-                let start = std::time::Instant::now();
-                let mut hasher = git_features::hash::Sha1::default();
-                hasher.update(&self.data[..right_before_trailer]);
-                progress.inc_by(right_before_trailer);
-                progress.show_throughput(start);
-                owned::Id::new_sha1(hasher.digest())
-            }
-        };
+        let actual =
+            match git_features::hash::bytes_of_file(&self.path, right_before_trailer, HashKind::Sha1, &mut progress) {
+                Ok(id) => id,
+                Err(_io_err) => {
+                    let start = std::time::Instant::now();
+                    let mut hasher = git_features::hash::Sha1::default();
+                    hasher.update(&self.data[..right_before_trailer]);
+                    progress.inc_by(right_before_trailer);
+                    progress.show_throughput(start);
+                    owned::Id::new_sha1(hasher.digest())
+                }
+            };
 
         let expected = self.checksum();
         if actual == expected {

git-odb/src/pack/index/verify.rs

@@ -3,7 +3,7 @@ use git_features::progress::{self, Progress};
 use git_object::{
     borrowed,
     bstr::{BString, ByteSlice},
-    owned, SHA1_SIZE,
+    owned, HashKind, SHA1_SIZE,
 };
 
 #[derive(thiserror::Error, Debug)]
@@ -51,7 +51,12 @@ impl index::File {
 
     pub fn verify_checksum(&self, mut progress: impl Progress) -> Result<owned::Id, Error> {
         let data_len_without_trailer = self.data.len() - SHA1_SIZE;
-        let actual = match git_features::hash::bytes_of_file(&self.path, data_len_without_trailer, &mut progress) {
+        let actual = match git_features::hash::bytes_of_file(
+            &self.path,
+            data_len_without_trailer,
+            HashKind::Sha1,
+            &mut progress,
+        ) {
             Ok(id) => id,
             Err(_io_err) => {
                 let start = std::time::Instant::now();