Merge branch 'master' into encoding_comparison_fix

jcouball · web-flow · commit ded40909a5d2 · 2020-04-05T12:06:55.000-07:00
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -1052,9 +1052,9 @@ def encoding_options
     def normalize_encoding(str)
       return str if str.valid_encoding? && str.encoding.name == default_encoding
 
-      return str.encode(default_encoding, str.encoding, encoding_options) if str.valid_encoding?
+      return str.encode(default_encoding, str.encoding, **encoding_options) if str.valid_encoding?
 
-      str.encode(default_encoding, detected_encoding(str), encoding_options)
+      str.encode(default_encoding, detected_encoding(str), **encoding_options)
     end
 
     def run_command(git_cmd, &block)
