Skip to content

Commit 57b85fe

Browse files
committed
Adapt to changes in gix-blame
1 parent c8634eb commit 57b85fe

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

gitoxide-core/src/repository/blame.rs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,17 @@ pub fn blame_file(
3535
.next()
3636
.expect("exactly one pattern");
3737

38-
let suspect = repo.head()?.peel_to_commit_in_place()?;
39-
let traverse =
40-
gix::traverse::commit::topo::Builder::from_iters(&repo.objects, [suspect.id], None::<Vec<gix::ObjectId>>)
41-
.with_commit_graph(repo.commit_graph_if_enabled()?)
42-
.build()?;
38+
let suspect: gix::ObjectId = repo.head()?.into_peeled_id()?.into();
39+
let cache: Option<gix::commitgraph::Graph> = repo.commit_graph_if_enabled()?;
4340
let mut resource_cache = repo.diff_resource_cache_for_tree_diff()?;
44-
let outcome = gix::blame::file(&repo.objects, traverse, &mut resource_cache, file.as_bstr(), range)?;
41+
let outcome = gix::blame::file(
42+
&repo.objects,
43+
suspect,
44+
cache,
45+
&mut resource_cache,
46+
file.as_bstr(),
47+
range,
48+
)?;
4549
let statistics = outcome.statistics;
4650
write_blame_entries(out, outcome)?;
4751

0 commit comments

Comments
 (0)