From 7b20e4c0348b9c7c59b13ee38a47a3d591f29db2 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Mon, 18 Feb 2019 23:19:39 +0000 Subject: [PATCH] Refactor GitAdapter#default_branch not to unnecessarily iterate through all elements (#30828). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Patch by Pavel Rosický. git-svn-id: http://svn.redmine.org/redmine/trunk@17883 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/scm/adapters/git_adapter.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb index fcc77f393..93d48a64d 100644 --- a/lib/redmine/scm/adapters/git_adapter.rb +++ b/lib/redmine/scm/adapters/git_adapter.rb @@ -108,11 +108,11 @@ module Redmine def default_branch bras = self.branches - return nil if bras.nil? - default_bras = bras.select{|x| x.is_default == true} - 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' + return unless bras + default_bras = bras.detect{|x| x.is_default == true} + return default_bras.to_s if default_bras + master_bras = bras.detect{|x| x.to_s == 'master'} + master_bras ? 'master' : bras.first.to_s end def entry(path=nil, identifier=nil) -- 2.39.5