diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-03-08 05:18:04 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-03-08 05:18:04 +0000 |
| commit | dc4ab44938f616f6dadf87b4bd76650a0f08c040 (patch) | |
| tree | e755f7c74a2f18ff7045313b0eb5c7548d028136 /lib/redmine/scm/adapters/git_adapter.rb | |
| parent | 7e6a5ec7ab215347553ed4ffbc4fee91bc5b74ff (diff) | |
| download | redmine-dc4ab44938f616f6dadf87b4bd76650a0f08c040.tar.gz redmine-dc4ab44938f616f6dadf87b4bd76650a0f08c040.zip | |
scm: git: use scm_cmd() in adapter branches().
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5043 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine/scm/adapters/git_adapter.rb')
| -rw-r--r-- | lib/redmine/scm/adapters/git_adapter.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb index b1db687e1..175cc6c37 100644 --- a/lib/redmine/scm/adapters/git_adapter.rb +++ b/lib/redmine/scm/adapters/git_adapter.rb @@ -79,13 +79,15 @@ module Redmine def branches return @branches if @branches @branches = [] - cmd = "#{self.class.sq_bin} --git-dir #{target('')} branch --no-color" - shellout(cmd) do |io| + cmd_args = %w|branch --no-color| + scm_cmd(*cmd_args) do |io| io.each_line do |line| @branches << line.match('\s*\*?\s*(.*)$')[1] end end @branches.sort! + rescue ScmCommandAborted + nil end def tags |