Skip to content

Commit 329a734

Browse files
committed
adapt to changes in gix-dir
1 parent d90412b commit 329a734

File tree

2 files changed

+5
-5
lines changed
  • gitoxide-core/src/repository
  • gix-status/src/index_as_worktree_with_renames

2 files changed

+5
-5
lines changed

gitoxide-core/src/repository/clean.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ pub(crate) mod function {
188188
}
189189

190190
match disk_kind {
191-
Kind::NonFile => {
191+
Kind::Untrackable => {
192192
if debug {
193193
writeln!(err, "DBG: skipped non-file at '{}'", entry.rela_path).ok();
194194
}
@@ -265,7 +265,7 @@ pub(crate) mod function {
265265
"WOULD remove"
266266
},
267267
suffix = match disk_kind {
268-
Kind::NonFile => unreachable!("always skipped earlier"),
268+
Kind::Untrackable => unreachable!("always skipped earlier"),
269269
Kind::Directory if entry.property == Some(gix::dir::entry::Property::EmptyDirectory) => {
270270
" empty"
271271
}

gix-status/src/index_as_worktree_with_renames/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ pub(super) mod function {
388388
impl<T, U> gix_dir::walk::Delegate for Delegate<'_, '_, T, U> {
389389
fn emit(&mut self, entry: EntryRef<'_>, collapsed_directory_status: Option<Status>) -> Action {
390390
// Status never shows untracked non-files
391-
if entry.disk_kind != Some(gix_dir::entry::Kind::NonFile) {
391+
if entry.disk_kind != Some(gix_dir::entry::Kind::Untrackable) {
392392
let entry = entry.to_owned();
393393
self.tx.send(Event::DirEntry(entry, collapsed_directory_status)).ok();
394394
}
@@ -469,7 +469,7 @@ pub(super) mod function {
469469
ModificationOrDirwalkEntry::Modification(c) => c.entry.mode.to_tree_entry_mode(),
470470
ModificationOrDirwalkEntry::DirwalkEntry { entry, .. } => entry.disk_kind.map(|kind| {
471471
match kind {
472-
Kind::NonFile => {
472+
Kind::Untrackable => {
473473
// Trees are never tracked for rewrites, so we 'pretend'.
474474
gix_object::tree::EntryKind::Tree
475475
}
@@ -507,7 +507,7 @@ pub(super) mod function {
507507
};
508508

509509
Ok(match kind {
510-
Kind::NonFile => {
510+
Kind::Untrackable => {
511511
// Go along with unreadable files, they are passed along without rename tracking.
512512
return Ok(object_hash.null());
513513
}

0 commit comments

Comments
 (0)