##// END OF EJS Templates
scm: git: move "--no-color" option from scm_cmd() to revision()....
Toshi MARUYAMA -
r4773:20a54f1ef5cf
parent child
Show More
@@ -145,7 +145,7 module Redmine
145
145
146 def revisions(path, identifier_from, identifier_to, options={})
146 def revisions(path, identifier_from, identifier_to, options={})
147 revisions = Revisions.new
147 revisions = Revisions.new
148 cmd_args = %w|log --raw --date=iso --pretty=fuller|
148 cmd_args = %w|log --no-color --raw --date=iso --pretty=fuller|
149 cmd_args << "--reverse" if options[:reverse]
149 cmd_args << "--reverse" if options[:reverse]
150 cmd_args << "--all" if options[:all]
150 cmd_args << "--all" if options[:all]
151 cmd_args << "-n" << "#{options[:limit].to_i}" if options[:limit]
151 cmd_args << "-n" << "#{options[:limit].to_i}" if options[:limit]
@@ -309,7 +309,6 module Redmine
309 repo_path = root_url || url
309 repo_path = root_url || url
310 full_args = [GIT_BIN, '--git-dir', repo_path]
310 full_args = [GIT_BIN, '--git-dir', repo_path]
311 full_args += args
311 full_args += args
312 full_args << '--no-color'
313 ret = shellout(full_args.map { |e| shell_quote e.to_s }.join(' '), &block)
312 ret = shellout(full_args.map { |e| shell_quote e.to_s }.join(' '), &block)
314 if $? && $?.exitstatus != 0
313 if $? && $?.exitstatus != 0
315 raise ScmCommandAborted, "git exited with non-zero status: #{$?.exitstatus}"
314 raise ScmCommandAborted, "git exited with non-zero status: #{$?.exitstatus}"
General Comments 0
You need to be logged in to leave comments. Login now