fix issue with color escape codes after recent update of git binaries

Signed-off-by: Marcel Hoyer <m.hoyer@cid.com>
ruby-git · Feb 10, 2020 · 455b0b7 · 455b0b7
1 parent c85dd82
commit 455b0b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
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(' ')
 

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