attr_file: fix handling of directory patterns with trailing spaces#4614
Merged
ethomson merged 1 commit intolibgit2:masterfrom Apr 16, 2018
Merged
attr_file: fix handling of directory patterns with trailing spaces#4614ethomson merged 1 commit intolibgit2:masterfrom
ethomson merged 1 commit intolibgit2:masterfrom
Conversation
segevfiner
reviewed
Apr 6, 2018
| if (--spec->length == 0) | ||
| return GIT_ENOTFOUND; | ||
|
|
||
| /* Remove trailing spaces. */ |
Contributor
It does. 👍 |
When comparing whether a path matches a directory rule, we pass the both the path and directory name to `fnmatch` with `GIT_ATTR_FNMATCH_DIRECTORY` being set. `fnmatch` expects the pattern to contain no trailing directory '/', which is why we try to always strip patterns of trailing slashes. We do not handle that case correctly though when the pattern itself has trailing spaces, causing the match to fail. Fix the issue by stripping trailing spaces and tabs for a rule previous to checking whether the pattern is a directory pattern with a trailing '/'. This replaces the whitespace-stripping in our ignore file parsing code, which was stripping whitespaces too late. Add a test to catch future breakage.
Member
Author
|
@segevfiner: you're right, it makes the code in the ignore parser redundant. Removed that code |
8f2d0b4 to
251d877
Compare
segevfiner
approved these changes
Apr 13, 2018
Member
|
Thanks @segevfiner for reporting the issue and verifying the fix. Thanks @pks-t for fixing! |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
When comparing whether a path matches a directory rule, we pass the
both the path and directory name to
fnmatchwithGIT_ATTR_FNMATCH_DIRECTORYbeing set.fnmatchexpects the pattern tocontain no trailing directory '/', which is why we try to always strip
patterns of trailing slashes. We do not handle that case correctly
though when the pattern itself has trailing spaces, causing the match to
fail.
Fix the issue by stripping trailing spaces and tabs for a rule previous
to checking whether the pattern is a directory pattern with a trailing
'/'. Add a test to catch future breakage.