Skip to content

Commit

Permalink
adapt to changes in gix-diff
Browse files Browse the repository at this point in the history
  • Loading branch information
Byron committed Nov 15, 2023
1 parent be06acc commit 246d87d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
3 changes: 3 additions & 0 deletions gix/src/object/tree/diff/for_each.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ pub enum Error {
ConfigureDiffAlgorithm(#[from] crate::config::diff::algorithm::Error),
#[error("Failure during rename tracking")]
RenameTracking(#[from] tracker::emit::Error),
#[error("Could not obtain worktree filter options")]
PipelineOptions(#[from] crate::filter::pipeline::options::Error),
}

///
Expand Down Expand Up @@ -175,6 +177,7 @@ where
),
},
&self.src_tree.repo.objects,
&mut gix_filter::Pipeline::new(crate::filter::Pipeline::options(self.src_tree.repo)?),
|push| {
self.src_tree
.traverse()
Expand Down
2 changes: 2 additions & 0 deletions gix/tests/object/tree/diff.rs
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,7 @@ mod track_rewrites {
insertions: 1,
before: 11,
after: 12,
similarity: 0.8888889
}),
"by similarity there is a diff"
);
Expand Down Expand Up @@ -529,6 +530,7 @@ mod track_rewrites {
insertions: 3,
before: 12,
after: 15,
similarity: 0.75
}),
"by similarity there is a diff"
);
Expand Down

0 comments on commit 246d87d

Please sign in to comment.