From 25657168b1588e39ac33b361c33534ed63c349c5 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Fri, 15 Jul 2011 23:48:06 +0000 Subject: [PATCH] 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 --- lib/redmine/scm/adapters/git_adapter.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb index 55cc6a2ec..fd1a9a83d 100644 --- a/lib/redmine/scm/adapters/git_adapter.rb +++ b/lib/redmine/scm/adapters/git_adapter.rb @@ -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 -- 2.39.5