Skip to content
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

Jump to bottom

Make "Find in Files" ignore directories with .gdignore in them #51081

Merged
merged 1 commit into from
Jul 30, 2021
Merged

Make "Find in Files" ignore directories with .gdignore in them #51081

merged 1 commit into from
Jul 30, 2021

Conversation

SirQuartz
Copy link
Contributor

This pull request fixes an issue where searches using the "Find in Files" function would include folders with .gdignore files in them. The editor is supposed to ignore directories with these files in them altogether, this makes sure it does when using "Find in Files."

Resolves: #51069

@SirQuartz
Make "Find in Files" searches ignore directories with .gdignore fil…
658b152 
…es in them

This pull request fixes an issue where searches using the "Find in Files" function would include folders with `.gdignore` files in them. The editor is supposed to ignore directories with these files in them altogether.
@SirQuartz SirQuartz changed the title Make "Find in Files" searches ignore directories with .gdignore fil… Make "Find in Files" searches ignore directories with .gdignore in them Jul 30, 2021
@SirQuartz SirQuartz changed the title Make "Find in Files" searches ignore directories with .gdignore in them Make "Find in Files" ignore directories with .gdignore in them Jul 30, 2021
@akien-mga akien-mga added bug cherrypick:3.3 cherrypick:3.x Considered for cherry-picking into a future 3.x release topic:editor labels Jul 30, 2021
@akien-mga akien-mga added this to the 4.0 milestone Jul 30, 2021
@SirQuartz SirQuartz changed the title Make "Find in Files" ignore directories with .gdignore in them Make "Find in Files" ignores directories with .gdignore in them Jul 30, 2021
@SirQuartz SirQuartz changed the title Make "Find in Files" ignores directories with .gdignore in them Make "Find in Files" ignore directories with .gdignore in them Jul 30, 2021
@SirQuartz
Copy link
Contributor Author

@akien-mga can this be merged?

@akien-mga
Copy link
Member

akien-mga commented Jul 30, 2021 •
edited
Loading

No need to ping me to merge something which I reviewed just one hour ago, on a Friday evening, while CI was still ongoing at the time of review... I'll come to it next time I go through approved PRs (i.e. daily).

@akien-mga akien-mga merged commit bda2f91 into godotengine:master Jul 30, 2021
@SirQuartz
Copy link
Contributor Author

SirQuartz commented Jul 30, 2021 •
edited
Loading

No need to ping me to merge something which I reviewed just one hour ago, on a Friday evening, while CI was still ongoing at the time of review... I'll come to it next time I go through approved PRs (i.e. daily).

My bad, sorry about that! Thank you!

@SirQuartz SirQuartz deleted the patch-38 branch July 30, 2021 21:36
@akien-mga
Copy link
Member

No worry! Also, if I do forget to merge something that I approved several days before, it's totally fine to ping me :)

@akien-mga
Copy link
Member

Cherry-picked for 3.4.

@akien-mga akien-mga removed the cherrypick:3.x Considered for cherry-picking into a future 3.x release label Aug 3, 2021
@akien-mga
Copy link
Member

Cherry-picked for 3.3.3.

@Razzlegames
Copy link
Contributor

@SirQuartz @akien-mga

Was this change intended to exclude all directories that have .gdignore even if there are contents in the file? I think it should not skip the directory if the file is not empty?

#55323

@Calinou
Copy link
Member

Calinou commented Nov 26, 2021 •
edited
Loading

Was this change intended to exclude all directories that have .gdignore even if there are contents in the file? I think it should not skip the directory if the file is not empty?

.gdignore files' contents are never read. See also #53583 which was rejected.

@Zireael07
Copy link
Contributor

Ninja'd by @Calinou while I was trying to track down where it was documented.

godotengine/godot-docs#5319

@raulsntos raulsntos mentioned this pull request Aug 14, 2024
Closed
@AThousandShips AThousandShips mentioned this pull request Oct 13, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@akien-mga akien-mga akien-mga approved these changes

Assignees
No one assigned
Labels
bug topic:editor
Projects
None yet
Milestone
4.0
Development

Successfully merging this pull request may close these issues.

"Find in Files" searches in folders with .gdignore
5 participants
@SirQuartz @akien-mga @Razzlegames @Calinou @Zireael07