Fix finding the nested config when a single file path is passed #3379
Merged
Conversation
Codecov Report
@@ Coverage Diff @@
## master #3379 +/- ##
==========================================
+ Coverage 90.48% 90.52% +0.03%
==========================================
Files 417 417
Lines 20508 20510 +2
==========================================
+ Hits 18557 18566 +9
+ Misses 1951 1944 -7
Continue to review full report at Codecov.
|
Contributor
Author
|
@jpsim This should be ready for your input! A couple things:
|
Contributor
Author
|
Hey @jpsim, I know it's a crazy time, but since it's been a couple weeks do you think you could take a look at the few PRs I have out? They're starting to encounter merge conflicts, and these bugs are blocking my team from using SwiftLint in our setup. |
ba053b7 to
02f9267
Compare
… is passed (realm#3342)" (realm#3362)" This reverts commit a67b0f2.
02f9267 to
41d8bf4
Compare
jpsim
approved these changes
Nov 8, 2020
jpsim
left a comment
Collaborator
There was a problem hiding this comment.
👍 Thanks for the PR! Will merge when CI is green.
2 tasks
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
4 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.
This was previously attempted in #3342, but produced a bug in the case where
--configis used to specify a config from outside of the source tree. The--configargument wasn't always being used as an override, and was being merged with the config in the source tree. This has now been addressed and reverts the revert done in #3362.Fixes #3341