kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scm: git: move "--no-color" option from scm_cmd() to revision(). 

Ruby 1.9.2 test fails.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4893 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-02-20 14:49:09 +00:00
parent fdff8d6b9c
commit 20a54f1ef5
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/redmine/scm/adapters/git_adapter.rb
View File

@ -145,7 +145,7 @@ module Redmine
def revisions(path, identifier_from, identifier_to, options={}) def revisions(path, identifier_from, identifier_to, options={})
revisions = Revisions.new revisions = Revisions.new
cmd_args = %w|log --raw --date=iso --pretty=fuller| cmd_args = %w|log --no-color --raw --date=iso --pretty=fuller|
cmd_args << "--reverse" if options[:reverse] cmd_args << "--reverse" if options[:reverse]
cmd_args << "--all" if options[:all] cmd_args << "--all" if options[:all]
cmd_args << "-n" << "#{options[:limit].to_i}" if options[:limit] cmd_args << "-n" << "#{options[:limit].to_i}" if options[:limit]
@ -309,7 +309,6 @@ module Redmine
repo_path = root_url || url repo_path = root_url || url
full_args = [GIT_BIN, '--git-dir', repo_path] full_args = [GIT_BIN, '--git-dir', repo_path]
full_args += args full_args += args
full_args << '--no-color'
ret = shellout(full_args.map { |e| shell_quote e.to_s }.join(' '), &block) ret = shellout(full_args.map { |e| shell_quote e.to_s }.join(' '), &block)
if $? && $?.exitstatus != 0 if $? && $?.exitstatus != 0
raise ScmCommandAborted, "git exited with non-zero status: #{$?.exitstatus}" raise ScmCommandAborted, "git exited with non-zero status: #{$?.exitstatus}"