Skip to content

Commit 2bf1e5f

Browse files
committedOct 8, 2024
adapt to changes in gix-diff
1 parent 7be142d commit 2bf1e5f

File tree

2 files changed

+9
-2
lines changed
  • gix/tests/object/tree
  • gix-status/src/index_as_worktree_with_renames

2 files changed

+9
-2
lines changed
 

‎gix-status/src/index_as_worktree_with_renames/mod.rs

+7
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,7 @@ pub(super) mod function {
404404
use crate::index_as_worktree_with_renames::{Entry, Error};
405405
use bstr::BStr;
406406
use gix_diff::rewrites::tracker::ChangeKind;
407+
use gix_diff::tree::visit::Relation;
407408
use gix_dir::entry::Kind;
408409
use gix_filter::pipeline::convert::ToGitOutcome;
409410
use gix_hash::oid;
@@ -437,6 +438,12 @@ pub(super) mod function {
437438
}
438439
}
439440

441+
fn relation(&self) -> Option<Relation> {
442+
// TODO: figure out if index or worktree can provide containerization - worktree should be possible.
443+
// index would take some processing.
444+
None
445+
}
446+
440447
fn kind(&self) -> ChangeKind {
441448
match self {
442449
ModificationOrDirwalkEntry::Modification(m) => match &m.status {

‎gix/tests/object/tree/diff.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1270,10 +1270,10 @@ rename to gix-sec/tests/sec.rs
12701270
"gix-sec/src/permission.rs",
12711271
"git-sec/src/trust.rs",
12721272
"gix-sec/src/trust.rs",
1273-
"git-sec/tests/identity/mod.rs",
1274-
"gix-sec/tests/identity/mod.rs",
12751273
"git-sec/tests/sec.rs",
12761274
"gix-sec/tests/sec.rs",
1275+
"git-sec/tests/identity/mod.rs",
1276+
"gix-sec/tests/identity/mod.rs",
12771277
]
12781278
);
12791279

0 commit comments

Comments
 (0)