summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-07-15 16:32:15 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-07-15 16:32:15 +0000
commit30476c90ee4a2e0678791530f00118ddf4cea709 (patch)
tree512370da6ec85414423e6723ab92c635158fe32f /lib
parentb8f96f6134139aeaa84f0d4ea5116d0671b7826a (diff)
downloadredmine-30476c90ee4a2e0678791530f00118ddf4cea709.tar.gz
redmine-30476c90ee4a2e0678791530f00118ddf4cea709.zip
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
Diffstat (limited to 'lib')
-rw-r--r--lib/redmine/scm/adapters/git_adapter.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb
index 704ff85b8..6fe31cb71 100644
--- a/lib/redmine/scm/adapters/git_adapter.rb
+++ b/lib/redmine/scm/adapters/git_adapter.rb
@@ -356,13 +356,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