Merge pull request #2377 from cruessler/add-sha-256-to-gix-commitgraph

Add GIX_TEST_FIXTURE_HASH to gix-testtools

Author: Byron

Cargo.lock

@@ -33,6 +33,7 @@ document-features = { version = "0.2.0", optional = true }
 [dev-dependencies]
 gix-testtools = { path = "../tests/tools" }
 gix-date = { path = "../gix-date" }
+gix-hash = { path = "../gix-hash", features = ["sha256"] }
 
 [package.metadata.docs.rs]
 all-features = true

gix-commitgraph/Cargo.toml

@@ -11,6 +11,20 @@ impl Graph {
         r.file.commit_at(r.pos)
     }
 
+    /// The kind of hash used in this `Graph`.
+    ///
+    /// Note that it is always conforming to the hash used in the owning repository.
+    ///
+    /// # Panics
+    ///
+    /// If the graph does not contain any `File`.
+    pub fn object_hash(&self) -> gix_hash::Kind {
+        self.files
+            .first()
+            .map(super::File::object_hash)
+            .expect("graph to have at least one file")
+    }
+
     /// Returns the commit matching the given `id`.
     pub fn commit_by_id(&self, id: impl AsRef<gix_hash::oid>) -> Option<Commit<'_>> {
         let r = self.lookup_by_id(id.as_ref())?;

gix-commitgraph/src/access.rs

@@ -81,6 +81,14 @@ pub fn graph_and_expected_named(
     let expected = inspect_refs(&repo_dir, refs);
     let cg =
         Graph::from_info_dir(&repo_dir.join(".git").join("objects").join("info")).expect("graph present and valid");
+    let object_hash = cg.object_hash();
+    let any_ref = expected.values().next().expect("at least one ref");
+    assert_eq!(
+        object_hash,
+        any_ref.id().kind(),
+        "graph hash kind should match fixture object IDs"
+    );
+
     (cg, expected)
 }