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

scm: git: use self.class.sq_bin for command name at adpter scm_cmd() (#8825). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6281 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-07-15 16:32:15 +00:00
parent b8f96f6134
commit 30476c90ee
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -356,13 +356,16 @@ module Redmine
def scm_cmd(*args, &block) def scm_cmd(*args, &block)
repo_path = root_url || url repo_path = root_url || url
full_args = [GIT_BIN, '--git-dir', repo_path] full_args = ['--git-dir', repo_path]
if self.class.client_version_above?([1, 7, 2]) if self.class.client_version_above?([1, 7, 2])
full_args << '-c' << 'core.quotepath=false' full_args << '-c' << 'core.quotepath=false'
full_args << '-c' << 'log.decorate=no' full_args << '-c' << 'log.decorate=no'
end end
full_args += args full_args += args
ret = shellout(full_args.map { |e| shell_quote e.to_s }.join(' '), &block) ret = shellout(
self.class.sq_bin + ' ' + 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}"
end end