diff options
| author | Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com> | 2010-10-29 23:21:57 +0000 |
|---|---|---|
| committer | Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com> | 2010-10-29 23:21:57 +0000 |
| commit | f8b79c52cb686cbcdfb396440b5adc9caa1b46a0 (patch) | |
| tree | 79f4839359f17a79a32b975a3397f741767c4d27 /lib | |
| parent | 55cf64393d56693972d4831d56614f525463b709 (diff) | |
| download | redmine-f8b79c52cb686cbcdfb396440b5adc9caa1b46a0.tar.gz redmine-f8b79c52cb686cbcdfb396440b5adc9caa1b46a0.zip | |
Force color to be disabled on git shell-outs. #5324
Contributed by Felix Schäfer
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4310 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/redmine/scm/adapters/git_adapter.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb index 5ed57c264..1db57c7d6 100644 --- a/lib/redmine/scm/adapters/git_adapter.rb +++ b/lib/redmine/scm/adapters/git_adapter.rb @@ -35,7 +35,7 @@ module Redmine def branches return @branches if @branches @branches = [] - cmd = "#{GIT_BIN} --git-dir #{target('')} branch" + cmd = "#{GIT_BIN} --git-dir #{target('')} branch --no-color" shellout(cmd) do |io| io.each_line do |line| @branches << line.match('\s*\*?\s*(.*)$')[1] @@ -86,7 +86,7 @@ module Redmine def lastrev(path,rev) return nil if path.nil? - cmd = "#{GIT_BIN} --git-dir #{target('')} log --date=iso --pretty=fuller --no-merges -n 1 " + cmd = "#{GIT_BIN} --git-dir #{target('')} log --no-color --date=iso --pretty=fuller --no-merges -n 1 " cmd << " #{shell_quote rev} " if rev cmd << "-- #{shell_quote path} " unless path.empty? shellout(cmd) do |io| @@ -114,7 +114,7 @@ module Redmine def revisions(path, identifier_from, identifier_to, options={}) revisions = Revisions.new - cmd = "#{GIT_BIN} --git-dir #{target('')} log --raw --date=iso --pretty=fuller " + cmd = "#{GIT_BIN} --git-dir #{target('')} log --no-color --raw --date=iso --pretty=fuller " cmd << " --reverse " if options[:reverse] cmd << " --all " if options[:all] cmd << " -n #{options[:limit]} " if options[:limit] @@ -209,7 +209,7 @@ module Redmine path ||= '' if identifier_to - cmd = "#{GIT_BIN} --git-dir #{target('')} diff #{shell_quote identifier_to} #{shell_quote identifier_from}" + 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}" end |