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

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
be67b2ec · Toshi MARUYAMA · Eric Davis · 09e76f29 · be67b2ec
Commit be67b2ec authored Mar 08, 2011 by Toshi MARUYAMA Committed by Eric Davis Apr 16, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

git_adapter.rb lib/redmine/scm/adapters/git_adapter.rb +4 -2

No files found.
--- 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