]> source.dussan.org Git - redmine.git/commitdiff
scm: git: move "--no-color" option from scm_cmd() to revision().
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Sun, 20 Feb 2011 14:49:09 +0000 (14:49 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Sun, 20 Feb 2011 14:49:09 +0000 (14:49 +0000)
Ruby 1.9.2 test fails.

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

lib/redmine/scm/adapters/git_adapter.rb

index 73b79d5d8a56087abfec1ac844b466b2843d219f..7d742235c7123475f80abbbb9f530707a488ff81 100644 (file)
@@ -145,7 +145,7 @@ module Redmine
 
         def revisions(path, identifier_from, identifier_to, options={})
           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 << "--all" if options[:all]
           cmd_args << "-n" << "#{options[:limit].to_i}" if options[:limit]
@@ -309,7 +309,6 @@ module Redmine
           repo_path = root_url || url
           full_args = [GIT_BIN, '--git-dir', repo_path]
           full_args += args
-          full_args << '--no-color'
           ret = shellout(full_args.map { |e| shell_quote e.to_s }.join(' '), &block)
           if $? && $?.exitstatus != 0
             raise ScmCommandAborted, "git exited with non-zero status: #{$?.exitstatus}"