Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork9.7k
[Finder] Fix finding VCS re-included files in excluded directory#45095
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
nicolas-grekas merged 1 commit intosymfony:5.4fromjulienfalque:gitignore-reincluded-filesJan 26, 2022
Merged
[Finder] Fix finding VCS re-included files in excluded directory#45095
nicolas-grekas merged 1 commit intosymfony:5.4fromjulienfalque:gitignore-reincluded-filesJan 26, 2022
Uh oh!
There was an error while loading.Please reload this page.
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
9a43190 tod108ac5CompareMember
nicolas-grekas commentedJan 26, 2022
Thank you@julienfalque. |
ContributorAuthor
julienfalque commentedJan 26, 2022
Thanks for merging@nicolas-grekas! What's your opinion about returning the directory as well (see#45095 (comment))? |
Member
nicolas-grekas commentedJan 26, 2022
I don't know, I'm not into that business :) |
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR fixes a bug where
Finderwould not return a file inside a directory when gitignore rules exclude the directory but re-include the file.The first commit makes
Finderreturn the file. Though, as shown by the second commit, the directory is still not returned. Strictly speaking, the directoryis ignored, so in some senseFinderis correct. But then it contains a file that is not ignored. In this case, Git would see the directory anyway. ShouldFinderreturn any ignored directory as soon as it contains a file that is not ignored? Even if that file is not part ofFinderresults?