Skip to content

fix(oxlint,oxfmt): Skip traversing .git directories #14590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 14, 2025
Merged

fix(oxlint,oxfmt): Skip traversing .git directories #14590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions apps/oxfmt/src/walk.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,16 @@ impl ignore::ParallelVisitor for WalkVisitor {
fn visit(&mut self, entry: Result<ignore::DirEntry, ignore::Error>) -> ignore::WalkState {
match entry {
Ok(entry) => {
// Skip if we can't get file type or if it's a directory
if let Some(file_type) = entry.file_type()
&& !file_type.is_dir()
&& let Some(source_type) = get_supported_source_type(entry.path())
{
let Some(file_type) = entry.file_type() else {
return ignore::WalkState::Continue;
};
if file_type.is_dir() {
// Skip traversing `.git` directories because `.git` is not a special case for `.hidden(false)`.
// <https://github.com/BurntSushi/ripgrep/issues/3099#issuecomment-3052460027>
if entry.file_name() == ".git" {
return ignore::WalkState::Skip;
}
} else if let Some(source_type) = get_supported_source_type(entry.path()) {
let walk_entry =
WalkEntry { path: entry.path().as_os_str().into(), source_type };
// Send each entry immediately through the channel
Expand Down
5 changes: 5 additions & 0 deletions apps/oxlint/src/walk.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ impl ignore::ParallelVisitor for WalkCollector {
fn visit(&mut self, entry: Result<ignore::DirEntry, ignore::Error>) -> ignore::WalkState {
match entry {
Ok(entry) => {
// Skip traversing `.git` directories because `.git` is not a special case for `.hidden(false)`.
// <https://github.com/BurntSushi/ripgrep/issues/3099#issuecomment-3052460027>
if entry.file_type().is_some_and(|ty| ty.is_dir()) && entry.file_name() == ".git" {
return ignore::WalkState::Skip;
}
if Walk::is_wanted_entry(&entry, &self.extensions) {
self.paths.push(entry.path().as_os_str().into());
}
Expand Down
Loading