diff options
Diffstat (limited to 'clang-tools-extra/clang-tidy')
-rw-r--r-- | clang-tools-extra/clang-tidy/ClangTidyOptions.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/clang-tools-extra/clang-tidy/ClangTidyOptions.cpp b/clang-tools-extra/clang-tidy/ClangTidyOptions.cpp index 997529392ff..15ca2155399 100644 --- a/clang-tools-extra/clang-tidy/ClangTidyOptions.cpp +++ b/clang-tools-extra/clang-tidy/ClangTidyOptions.cpp @@ -241,10 +241,9 @@ FileOptionsProvider::TryReadConfigFile(StringRef Directory) { continue; } - ClangTidyOptions Defaults = DefaultOptionsProvider::getOptions(Directory); - // Only use checks from the config file. - Defaults.Checks = None; - return Defaults.mergeWith(*ParsedOptions).mergeWith(OverrideOptions); + return DefaultOptionsProvider::getOptions(Directory) + .mergeWith(*ParsedOptions) + .mergeWith(OverrideOptions); } return llvm::None; } |