gitlab_git 10.6.8 → 10.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0988bb5a3617f4bac08f53781bea813be09c7a9
-  data.tar.gz: 0ce71e0cf618cf267c0b2ef057cb6153026b6274
+  metadata.gz: 170a3ddbc4b9f64384951aa39f1ff0587aa966b8
+  data.tar.gz: fd220061aea1df75b942f4f798c3e8122bce3143
 SHA512:
-  metadata.gz: 241ab6732a48d690d39a71d57d8bc311fa7ea7dc5b6fe992fb71ea1e31b407166203c16ebb48762a688933c0a014d92c4138ac1d3abbdaab46e2ecda80f20be6
-  data.tar.gz: 904a3b9e9f1c2ded3568c3fbd697bbda11f3c2b20c0fe903bdfeb9cdcd1a89cf386f96c0c6a20dcf4080638798961b6a7b36235e70d5ae94bd00b3c6521d75c5
+  metadata.gz: 06df3838918c6c9f544e768a403716600b7907d77a3b47c7b79e3da7f93ce18569ab39cbe27b3f3052d27dfcfd49a8df48feafe80aeb51d911060f4cfc285290
+  data.tar.gz: 1989d5dde3ac74aca89cfcfe3107f77176e7e6027a5009dba85166dc08ee2ed3ca3283e17f02e0cdb96f1a3d4bfa7dc924b80f1af3fce3f9e009cf431e2f609a

data/VERSION

@@ -1 +1 @@
-10.6.8
+10.7.0

data/lib/gitlab_git/attributes.rb

@@ -99,6 +99,8 @@ module Gitlab
 
         File.open(full_path, 'r') do |handle|
           handle.each_line do |line|
+            break unless line.valid_encoding?
+
             yield line.strip
           end
         end

data/lib/gitlab_git/diff.rb

@@ -261,17 +261,7 @@ module Gitlab
       def init_from_rugged_patch(patch, collapse: false)
         # Don't bother initializing diffs that are too large. If a diff is
         # binary we're not going to display anything so we skip the size check.
-        unless patch.delta.binary?
-          diff_size = patch_size(patch)
-
-          if diff_size >= DIFF_SIZE_LIMIT
-            prune_large_diff!
-            return
-          elsif collapse && diff_size >= DIFF_COLLAPSE_LIMIT
-            prune_collapsed_diff!
-            return
-          end
-        end
+        return if !patch.delta.binary? && prune_large_patch(patch, collapse)
 
         @diff = encode!(strip_diff_headers(patch.to_s))
       end
@@ -287,17 +277,28 @@ module Gitlab
         prune_collapsed_diff! if collapse && collapsible?
       end
 
-      # Returns the size of a diff without taking any diff markers into account.
-      def patch_size(patch)
+      # If the patch surpasses any of the diff limits it calls the appropiate
+      # prune method and returns true. Otherwise returns false.
+      def prune_large_patch(patch, collapse)
         size = 0
 
         patch.each_hunk do |hunk|
           hunk.each_line do |line|
             size += line.content.bytesize
+
+            if size >= DIFF_SIZE_LIMIT
+              prune_large_diff!
+              return true
+            end
           end
         end
 
-        size
+        if collapse && size >= DIFF_COLLAPSE_LIMIT
+          prune_collapsed_diff!
+          return true
+        end
+
+        false
       end
 
       # Strip out the information at the beginning of the patch's text to match

data/lib/gitlab_git/ref.rb

@@ -12,6 +12,10 @@ module Gitlab
       # when tag reference on other tag it can be tag sha
       attr_reader :target
 
+      # Dereferenced target
+      # Commit object to which the Ref points to
+      attr_reader :dereferenced_target
+
       # Extract branch name from full ref path
       #
       # Ex.
@@ -29,8 +33,16 @@ module Gitlab
       def initialize(repository, name, target)
         encode! name
         @name = name.gsub(/\Arefs\/(tags|heads)\//, '')
-
-        @target = Commit.find(repository, target)
+        @dereferenced_target = Commit.find(repository, target)
+        @target = if target.respond_to?(:oid)
+                    target.oid
+                  elsif target.respond_to?(:name)
+                    target.name
+                  elsif target.is_a? String
+                    target
+                  else
+                    nil
+                  end
       end
     end
   end

data/lib/gitlab_git/repository.rb

@@ -116,17 +116,14 @@ module Gitlab
           message = nil
 
           if ref.target.is_a?(Rugged::Tag::Annotation)
-            object = ref.target
             tag_message = ref.target.message
 
             if tag_message.respond_to?(:chomp)
               message = tag_message.chomp
             end
-          else
-            object = nil # Lightweight tags aren't git objects
           end
 
-          Tag.new(self, object, ref.name, ref.target, message)
+          Tag.new(self, ref.name, ref.target, message)
         end.sort_by(&:name)
       end
 

data/lib/gitlab_git/tag.rb

@@ -3,23 +3,17 @@ module Gitlab
     class Tag < Ref
       attr_reader :object_sha
 
-      def initialize(repository, object, name, target, message = nil)
+      def initialize(repository, name, target, message = nil)
         super(repository, name, target)
-        @object_sha = if object.respond_to?(:oid)
-                        object.oid
-                      elsif object.respond_to?(:name)
-                        object.name
-                      elsif object.is_a? String
-                        object
-                      else
-                        nil
-                      end
+
         @message = message
       end
 
       def message
         encode! @message
       end
+
+      private
     end
   end
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 10.6.8
+  version: 10.7.0
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-29 00:00:00.000000000 Z
+date: 2016-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-linguist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.7.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.24.0
 - !ruby/object:Gem::Dependency
   name: charlock_holmes
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.6
 description: GitLab wrapper around git objects
@@ -116,12 +116,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []