Merge pull request #2542 from cruessler/run-gix-blame-tests-with-sha-256

Use `GIX_TEST_FIXTURE_HASH` for `gix-blame`

Author: Byron

gix-blame/Cargo.toml

@@ -39,11 +39,12 @@ smallvec = "1.15.1"
 thiserror = "2.0.18"
 
 [dev-dependencies]
-gix-ref = { path = "../gix-ref" }
+gix-hash = { path = "../gix-hash", features = ["sha1", "sha256"] }
+gix-ref = { path = "../gix-ref", features = ["sha1", "sha256"] }
 gix-filter = { path = "../gix-filter" }
 gix-fs = { path = "../gix-fs" }
-gix-index = { path = "../gix-index" }
-gix-odb = { path = "../gix-odb" }
+gix-index = { path = "../gix-index", features = ["sha1"] }
+gix-odb = { path = "../gix-odb", features = ["sha1"] }
 gix-testtools = { path = "../tests/tools" }
 pretty_assertions = "1.4.0"
 

gix-blame/tests/blame.rs

@@ -4,6 +4,10 @@ use gix_blame::BlameRanges;
 use gix_hash::ObjectId;
 use gix_object::bstr;
 
+fn fixture_hash_kind() -> gix_hash::Kind {
+    gix_testtools::hash_kind_from_env().unwrap_or_default()
+}
+
 struct Baseline<'a> {
     lines: bstr::Lines<'a>,
     filenames: BTreeMap<ObjectId, bstr::BString>,
@@ -16,7 +20,7 @@ mod baseline {
     use gix_hash::ObjectId;
     use gix_ref::bstr::ByteSlice;
 
-    use super::Baseline;
+    use super::{fixture_hash_kind, Baseline};
 
     // These fields are used by `git` in its porcelain output.
     const HEADER_FIELDS: [&str; 12] = [
@@ -73,7 +77,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 = fixture_hash_kind().null();
             let mut skip_lines: u32 = 0;
             let mut source_file_name: Option<gix_object::bstr::BString> = None;
 
@@ -155,14 +159,23 @@ impl Fixture {
     fn for_worktree_path(worktree_path: PathBuf) -> gix_testtools::Result<Fixture> {
         use gix_ref::store::WriteReflog;
 
+        let object_hash = fixture_hash_kind();
         let store = gix_ref::file::Store::at(
             worktree_path.join(".git"),
             gix_ref::store::init::Options {
                 write_reflog: WriteReflog::Disable,
+                object_hash,
                 ..Default::default()
             },
         );
-        let odb = gix_odb::at(worktree_path.join(".git/objects"))?;
+        let odb = gix_odb::at_opts(
+            worktree_path.join(".git/objects"),
+            Vec::new(),
+            gix_odb::store::init::Options {
+                object_hash,
+                ..Default::default()
+            },
+        )?;
 
         let mut reference = gix_ref::file::Store::find(&store, "HEAD")?;
 
@@ -172,7 +185,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

@@ -241,7 +241,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