Use GIX_TEST_FIXTURE_HASH for gix-blame

Author: cruessler

gix-blame/Cargo.toml

@@ -39,6 +39,7 @@ smallvec = "1.15.1"
 thiserror = "2.0.18"
 
 [dev-dependencies]
+gix-hash = { version = "^0.23.0", path = "../gix-hash", features = ["sha1", "sha256"] }
 gix-ref = { path = "../gix-ref" }
 gix-filter = { path = "../gix-filter" }
 gix-fs = { path = "../gix-fs" }

gix-blame/tests/blame.rs

@@ -73,7 +73,7 @@ mod baseline {
 
         fn next(&mut self) -> Option<Self::Item> {
             let mut ranges = None;
-            let mut commit_id = gix_hash::Kind::Sha1.null();
+            let mut commit_id = gix_testtools::hash_kind_from_env().unwrap_or_default().null();
             let mut skip_lines: u32 = 0;
             let mut source_file_name: Option<gix_object::bstr::BString> = None;
 
@@ -162,7 +162,12 @@ impl Fixture {
                 ..Default::default()
             },
         );
-        let odb = gix_odb::at(worktree_path.join(".git/objects"))?;
+        let object_hash = gix_testtools::hash_kind_from_env().unwrap_or_default();
+        let options = gix_odb::store::init::Options {
+            object_hash,
+            ..Default::default()
+        };
+        let odb = gix_odb::at_opts(worktree_path.join(".git/objects"), Vec::new(), options)?;
 
         let mut reference = gix_ref::file::Store::find(&store, "HEAD")?;
 
@@ -172,7 +177,7 @@ impl Fixture {
         let head_id = reference.peel_to_id(&store, &odb)?;
 
         let git_dir = worktree_path.join(".git");
-        let index = gix_index::File::at(git_dir.join("index"), gix_hash::Kind::Sha1, false, Default::default())?;
+        let index = gix_index::File::at(git_dir.join("index"), object_hash, false, Default::default())?;
         let stack = gix_worktree::Stack::from_state_and_ignore_case(
             worktree_path.clone(),
             false,

gix-blame/tests/fixtures/generated-archives/.gitignore

@@ -1 +1,2 @@
-make_blame_repo.tar
+make_blame_repo.tar
+make_blame_repo_sha256.tar

gix-blame/tests/fixtures/generated-archives/make_blame_rename_tracking_repo_sha256.tar

@@ -238,7 +238,8 @@ unit-tests:
     cargo nextest run -p gix-transport --features async-client --no-fail-fast
     cargo nextest run -p gix-protocol --features blocking-client --no-fail-fast
     cargo nextest run -p gix-protocol --features async-client --no-fail-fast
-    cargo nextest run -p gix-blame --no-fail-fast
+    env GIX_TEST_FIXTURE_HASH=sha1 cargo nextest run -p gix-blame --no-fail-fast
+    env GIX_TEST_FIXTURE_HASH=sha256 cargo nextest run -p gix-blame --no-fail-fast
     env GIX_TEST_FIXTURE_HASH=sha1 cargo nextest run -p gix-refspec --no-fail-fast
     env GIX_TEST_FIXTURE_HASH=sha256 cargo nextest run -p gix-refspec --no-fail-fast
     cargo nextest run -p gix --no-default-features --no-fail-fast