Merged r6281 from trunk.
scm: git: use self.class.sq_bin for command name at adpter scm_cmd(). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6293 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
4852b38efc
commit
25657168b1
|
@ -359,13 +359,16 @@ module Redmine
|
|||
|
||||
def scm_cmd(*args, &block)
|
||||
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])
|
||||
full_args << '-c' << 'core.quotepath=false'
|
||||
full_args << '-c' << 'log.decorate=no'
|
||||
end
|
||||
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
|
||||
raise ScmCommandAborted, "git exited with non-zero status: #{$?.exitstatus}"
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue