diff options
| author | Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com> | 2010-11-07 15:19:05 +0000 |
|---|---|---|
| committer | Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com> | 2010-11-07 15:19:05 +0000 |
| commit | 2ca9bb3cca0b43e4a3ee8da12d87baf957acbeab (patch) | |
| tree | bcf04235ae67aeae2e7ceb4049982467f9a5c953 /lib | |
| parent | 635c177eeae73a5913e3d9a43146e6de8c405edf (diff) | |
| download | redmine-2ca9bb3cca0b43e4a3ee8da12d87baf957acbeab.tar.gz redmine-2ca9bb3cca0b43e4a3ee8da12d87baf957acbeab.zip | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/redmine/scm/adapters/git_adapter.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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 |