From: Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com>
Date: Sun, 7 Nov 2010 15:19:05 +0000 (+0000)
Subject: Added missing --no-color option in some git shell-outs. #5324
X-Git-Tag: 1.1.0~189
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2ca9bb3cca0b43e4a3ee8da12d87baf957acbeab;p=redmine.git

Added missing --no-color option in some git shell-outs. #5324

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4386 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb
index 1db57c7d6..e801f22f7 100644
--- a/lib/redmine/scm/adapters/git_adapter.rb
+++ b/lib/redmine/scm/adapters/git_adapter.rb
@@ -211,7 +211,7 @@ module Redmine
           if identifier_to
             cmd = "#{GIT_BIN} --git-dir #{target('')} diff --no-color #{shell_quote identifier_to} #{shell_quote identifier_from}" 
           else
-            cmd = "#{GIT_BIN} --git-dir #{target('')} show #{shell_quote identifier_from}"
+            cmd = "#{GIT_BIN} --git-dir #{target('')} show --no-color #{shell_quote identifier_from}"
           end
 
           cmd << " -- #{shell_quote path}" unless path.empty?
@@ -255,7 +255,7 @@ module Redmine
           if identifier.nil?
             identifier = 'HEAD'
           end
-          cmd = "#{GIT_BIN} --git-dir #{target('')} show #{shell_quote(identifier + ':' + path)}"
+          cmd = "#{GIT_BIN} --git-dir #{target('')} show --no-color #{shell_quote(identifier + ':' + path)}"
           cat = nil
           shellout(cmd) do |io|
             io.binmode