Fix KeyError in detailed_match_files for unmatched negation patterns#105
Open
bysiber wants to merge 1 commit intocpburnz:masterfrom
Open
Fix KeyError in detailed_match_files for unmatched negation patterns#105bysiber wants to merge 1 commit intocpburnz:masterfrom
bysiber wants to merge 1 commit intocpburnz:masterfrom
Conversation
When a negation pattern (include=False) matches files that were not previously added by an inclusion pattern, the 'del return_files[file]' raises a KeyError. This happens when a negation pattern is broader than the preceding inclusion patterns. For example, '*.txt' followed by 'checkout -b fix/detailed-match-files-keyerror master.log' — the negation matches .log files that were never included. Add a membership check before deletion to skip files that aren't in the result set, consistent with how gitignore negation works (it can only un-ignore files that were previously ignored).
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
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.
detailed_match_files()raisesKeyErrorwhen a negation pattern (include=False) matches a file that wasn't previously added by an inclusion pattern.For example:
The
!*.lognegation pattern matchestest.log, but that file was never added to the result set by a prior inclusion pattern. Thedel return_files[file]on line 160 ofutil.pyraisesKeyError.The fix adds a membership check before deletion — if a file isn't in the result set, the negation is simply a no-op, which is consistent with how gitignore processes negation (it can only un-ignore files that were previously ignored).