gitlab_git 10.2.0 → 10.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4256a9124c547dd37ad82929922826b549d035e
-  data.tar.gz: 41c5334b6556a1936a5a83888bf30a0f0b6626ce
+  metadata.gz: 6c94b6a55ac8082363a377e7a9a7cc8c0d98638d
+  data.tar.gz: 75535b754be9e04d1d4ed19e718c502241221f03
 SHA512:
-  metadata.gz: 45d7141e374418211be9691de8644deba06f420e53465b53d9bb59571382343c3d750e398b53524f21c50d54a105fe963a282e9fb783a5d6ada1828c90655b50
-  data.tar.gz: c4787ce560bc314df0709c000298faebe77638c6a723bf6e5ba3edb32600f38a5cc30f51bc994ad1789aa8c74bc72f07aa50d4d19a5796f6339d890a1c815526
+  metadata.gz: 50ffd69f42646ba5f2c9c293127d64590744f965b33b158e543bc36c1673eb2da9af5dea7ae3abb94692afd5bc51fd888db8712191eabb80a162be44c66929ab
+  data.tar.gz: cd9d15af5c913484f62c0e18fd1a1962a28eff08d918f533427c55a4c954eefd826d7efc5276e150daa44f9c1ba7775aacf860839e885797e7d32e64b1341c5e

data/VERSION

@@ -1 +1 @@
-10.2.0
+10.2.1

data/lib/gitlab_git/blob.rb

@@ -13,7 +13,7 @@ module Gitlab
       # blob data should use load_all_data!.
       MAX_DATA_DISPLAY_SIZE = 10485760
 
-      attr_accessor :name, :path, :size, :data, :mode, :id, :commit_id
+      attr_accessor :name, :path, :size, :data, :mode, :id, :commit_id, :loaded_size
 
       class << self
         def find(repository, sha, path)
@@ -215,6 +215,8 @@ module Gitlab
         end
 
         @loaded_all_data = false
+        # Retain the actual size before it is encoded
+        @loaded_size = @data.bytesize
       end
 
       def empty?
@@ -233,6 +235,7 @@ module Gitlab
 
         @loaded_all_data = true
         @data = repository.lookup(id).content
+        @loaded_size = @data.bytesize
       end
 
       def name
@@ -267,7 +270,7 @@ module Gitlab
       end
 
       def truncated?
-        size > data.bytes.size
+        size && (size > loaded_size)
       end
 
       private

data/lib/gitlab_git/repository.rb

@@ -809,22 +809,6 @@ module Gitlab
         rugged.remotes[remote_name].push(refspecs)
       end
 
-      # Return a String containing the mbox-formatted diff between +from+ and
-      # +to+.  See #diff for the allowed keys in the +options+ hash.
-      def format_patch(from, to, options = {})
-        options ||= {}
-        break_rewrites = options[:break_rewrites]
-        actual_options = Diff.filter_diff_options(options)
-
-        from_sha = rugged.rev_parse_oid(from)
-        to_sha = rugged.rev_parse_oid(to)
-        commits_between(from_sha, to_sha).map do |commit|
-          # Ignore merge commits, which have more than one parent,
-          # in creation of patch to mimic the behavior of `git format-patch`
-          commit.to_mbox(actual_options) if commit.parents.length <= 1
-        end.flatten.join("\n")
-      end
-
       # Merge the +source_name+ branch into the +target_name+ branch. This is
       # equivalent to `git merge --no_ff +source_name+`, since a merge commit
       # is always created.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 10.2.0
+  version: 10.2.1
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-16 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-linguist