gitlab_git 7.2.23 → 7.2.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 526652cdb899fa7a93b738a96cdbaf3bd4253696
-  data.tar.gz: 72c0a8515d8ff04ad5883a2df941d12f73e6042e
+  metadata.gz: 320a203e93a3ce0ad48aa4edec7afa9b72da8b99
+  data.tar.gz: cc651b333e40c5152e3e732bcb3bccbe267b012b
 SHA512:
-  metadata.gz: 20e1b6d5258a55c78e9ba98f64dfb4c307aca056937f5c2f3b50a30cccedc85f9ded4c0f29186a7d9c1ef6936bbd59c63870abdc4b3c073175fd27312ba10e67
-  data.tar.gz: d1abe2c401395bb8e05de03c1d681a5c7848d9fe1be9f1e1e06120c3977b17de7c99b2770fd7cb9e0e83bf965bdb3d4ea03fdccd6140c95020d37830d8f27dfb
+  metadata.gz: c3ee43227084d36f9cf9544ccbab03787e3f453341ee4af66bd71bce154fd238804501324ded8ea331a778a511ea8598ad6b047a9f8a270a130a739438fd8336
+  data.tar.gz: 67d85099411399ddad30d001d12704def155f08d716de240b3675e7aff08c5b59ace76bbe28100413a3b2c456c534c24a93ed285ed659bcf606a995bf0148663

data/VERSION

@@ -1 +1 @@
-7.2.23
+7.2.24

data/lib/gitlab_git/repository.rb

@@ -15,9 +15,6 @@ module Gitlab
       class InvalidBlobName < StandardError; end
       class InvalidRef < StandardError; end
 
-      # Default branch in the repository
-      attr_accessor :root_ref
-
       # Full path to repo
       attr_reader :path
 
@@ -32,7 +29,11 @@ module Gitlab
       def initialize(path)
         @path = path
         @name = path.split("/").last
-        @root_ref = discover_default_branch
+      end
+
+      # Default branch in the repository
+      def root_ref
+        @root_ref ||= discover_default_branch
       end
 
       # Alias to old method for compatibility
@@ -63,6 +64,19 @@ module Gitlab
         end.compact.sort_by(&:name)
       end
 
+      # Returns the number of valid branches
+      def branch_count
+        rugged.branches.count do |ref|
+          begin
+            ref.name && ref.target # ensures the branch is valid
+
+            true
+          rescue Rugged::ReferenceError
+            false
+          end
+        end
+      end
+
       # Returns an Array of tag names
       def tag_names
         rugged.tags.map { |t| t.name }
@@ -119,16 +133,22 @@ module Gitlab
       # - If one branch is present, returns its name
       # - If two or more branches are present, returns current HEAD or master or first branch
       def discover_default_branch
-        if branch_names.length == 0
-          nil
-        elsif branch_names.length == 1
-          branch_names.first
-        elsif rugged_head && branch_names.include?(Ref.extract_branch_name(rugged_head.name))
-          Ref.extract_branch_name(rugged_head.name)
-        elsif branch_names.include?("master")
-          "master"
+        names = branch_names
+
+        return if names.empty?
+
+        return names[0] if names.length == 1
+
+        if rugged_head
+          extracted_name = Ref.extract_branch_name(rugged_head.name)
+
+          return extracted_name if names.include?(extracted_name)
+        end
+
+        if names.include?('master')
+          'master'
         else
-          branch_names.first
+          names[0]
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 7.2.23
+  version: 7.2.24
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-linguist