Merge pull request #68 from koic/fix_an_error_for_redundant_merge

[Fix #67] Fix an error for `Performance/RedundantMerge`
rubocop · Jul 12, 2019 · 69ba7f7 · 69ba7f7
2 parents 29316f4 + e286f25
commit 69ba7f7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## master (unreleased)
 
+### Bug fixes
+
+* [#67](https://github.com/rubocop-hq/rubocop-performance/issues/67): Fix an error for `Performance/RedundantMerge` when `MaxKeyValuePairs` option is set to `null`. ([@koic][])
+
 ## 1.4.0 (2019-06-20)
 
 ### Bug fixes

diff --git a/lib/rubocop/cop/performance/redundant_merge.rb b/lib/rubocop/cop/performance/redundant_merge.rb
@@ -132,7 +132,7 @@ def indent_width
         end
 
         def max_key_value_pairs
-          Integer(cop_config['MaxKeyValuePairs'])
+          Integer(cop_config['MaxKeyValuePairs']) || 2
         end
 
         # A utility class for checking the use of values within an