Skip to content
New issue

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

#

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

Already on GitHub? # to your account

fix(cli): use matched_path_or_any_parents when checking if a file is ignored #8903

Merged
merged 5 commits into from
Mar 6, 2024
Merged

fix(cli): use matched_path_or_any_parents when checking if a file is ignored #8903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6695966
fix: taurignore ignoreing folders not working for watch
anatawa12 Feb 19, 2024
ff8d26c
docs: add to changes
anatawa12 Feb 19, 2024
432e6af
fix: panic: path is expected to be under the root
anatawa12 Feb 19, 2024
4925134
Update taurignore-ignoring-folders-not-working-for-watch.md
amrbashir Mar 6, 2024
a594e24
Update taurignore-ignoring-folders-not-working-for-watch.md
amrbashir Mar 6, 2024
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
6 changes: 6 additions & 0 deletions .changes/taurignore-ignoring-folders-not-working-for-watch.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'tauri-cli': patch:bug
'@tauri-apps/cli': patch:bug
---

Fix `.taurignore` failing to ignore in some cases.
6 changes: 5 additions & 1 deletion tooling/cli/src/interface/rust.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,11 @@ struct IgnoreMatcher(Vec<Gitignore>);
impl IgnoreMatcher {
fn is_ignore(&self, path: &Path, is_dir: bool) -> bool {
for gitignore in &self.0 {
if gitignore.matched(path, is_dir).is_ignore() {
if path.starts_with(gitignore.path())
&& gitignore
.matched_path_or_any_parents(path, is_dir)
.is_ignore()
{
return true;
}
}
Expand Down
Loading