summaryrefslogtreecommitdiffstats
path: root/lib/redmine/scm/adapters/git_adapter.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/redmine/scm/adapters/git_adapter.rb')
-rw-r--r--lib/redmine/scm/adapters/git_adapter.rb6
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