summaryrefslogtreecommitdiffstats
path: root/lib/redmine
diff options
context:
space:
mode:
Diffstat (limited to 'lib/redmine')
-rw-r--r--lib/redmine/scm/adapters/git_adapter.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb
index c7bdbe13c..44d2be8e0 100644
--- a/lib/redmine/scm/adapters/git_adapter.rb
+++ b/lib/redmine/scm/adapters/git_adapter.rb
@@ -111,8 +111,9 @@ module Redmine
bras = self.branches
return nil if bras.nil?
default_bras = bras.select{|x| x.is_default == true}
- return default_bras.first if ! default_bras.empty?
- bras.include?('master') ? 'master' : bras.first
+ return default_bras.first.to_s if ! default_bras.empty?
+ master_bras = bras.select{|x| x.to_s == 'master'}
+ master_bras.empty? ? bras.first.to_s : 'master'
end
def entry(path=nil, identifier=nil)