diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-02-20 14:49:09 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-02-20 14:49:09 +0000 |
| commit | 20a54f1ef5cf15a0fa31de004ceb4ea34446fd42 (patch) | |
| tree | ae64949defe7d3593c3a038f7a301771a4383c9f | |
| parent | fdff8d6b9c5615e611f80e17cbb31d2a87df2334 (diff) | |
| download | redmine-20a54f1ef5cf15a0fa31de004ceb4ea34446fd42.tar.gz redmine-20a54f1ef5cf15a0fa31de004ceb4ea34446fd42.zip | |
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
| -rw-r--r-- | lib/redmine/scm/adapters/git_adapter.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb index 73b79d5d8..7d742235c 100644 --- a/lib/redmine/scm/adapters/git_adapter.rb +++ b/lib/redmine/scm/adapters/git_adapter.rb @@ -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}" |