Ruby version compatibility conflict solution (#453)

tit · mhoyer · web-flow · commit af4902b33382 · 2020-04-05T10:33:35.000-07:00
``` $ ruby --version $ irb -r git ``` This warning call because lines 1055 and 1057 have old Ruby syntax. ``` return str.encode(default_encoding, str.encoding, encoding_options) if str.valid_encoding? ``` @see https://piechowski.io/post/last-arg-keyword-deprecated-ruby-2-7/ Signed-off-by: Marcel Hoyer <mhoyer@pixelplastic.de> Signed-off-by: Sergey Blohin <sblohin@yandex.ru> Co-authored-by: Marcel Hoyer <mhoyer@pixelplastic.de>
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 == 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)
