Ruby version compatibility conflict solution

mhoyer · tit · commit 77db0780e8cd · 2020-02-19T23:08:03.000+03: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: Sergey Blohin <sblohin@yandex.ru>
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -945,6 +945,7 @@ def command(cmd, opts = [], chdir = true, redirect = '', &block)
       global_opts = []
       global_opts << "--git-dir=#{@git_dir}" if !@git_dir.nil?
       global_opts << "--work-tree=#{@git_work_dir}" if !@git_work_dir.nil?
+      global_opts << ["-c", "color.ui=false"]
 
       opts = [opts].flatten.map {|s| escape(s) }.join(' ')
 
@@ -1051,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)
diff --git a/tests/units/test_logger.rb b/tests/units/test_logger.rb
@@ -19,7 +19,7 @@ def test_logger
     @git.branches.size
     
     logc = File.read(log.path)
-    assert(/INFO -- : git '--git-dir=[^']+' '--work-tree=[^']+' branch '-a'/.match(logc))
+    assert(/INFO -- : git '--git-dir=[^']+' '--work-tree=[^']+' '-c' 'color.ui=false' branch '-a'/.match(logc))
     assert(/DEBUG -- :   diff_over_patches/.match(logc))
 
     log = Tempfile.new('logfile')
@@ -31,7 +31,7 @@ def test_logger
     @git.branches.size
     
     logc = File.read(log.path)
-    assert(/INFO -- : git '--git-dir=[^']+' '--work-tree=[^']+' branch '-a'/.match(logc))
+    assert(/INFO -- : git '--git-dir=[^']+' '--work-tree=[^']+' '-c' 'color.ui=false' branch '-a'/.match(logc))
     assert(!/DEBUG -- :   diff_over_patches/.match(logc))
   end
   
