gitlab_git 9.0.1 → 9.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 918fb34f97acc6f5d4065767e005ba2b5ffed166
-  data.tar.gz: f16d2885d1c4b20708e3b8483da85d1cd3fefcae
+  metadata.gz: 14ccd03ccf2f97ca59ae88f4c50979b928e75f66
+  data.tar.gz: 417da7b58a2102d460fe859a7d1b72cc13a02253
 SHA512:
-  metadata.gz: a38a52b74be4277d930c10b4735dde75e2f6a2040c2f5ceee6710a67da719adc447ea42cb46336371e8a355e0396ebe51e7e08c3ddae567b1cd2bd28ef9816b7
-  data.tar.gz: 30ff567681ea48ce8efbe7a86f4092a38a1d3e46097d6b9e04b125365949087d11004cbfadd901bfd57a7d4532ef75056b4bc038b960b1f2de79aca23c2111bc
+  metadata.gz: b54ad94d138b1906ea3fccd0d31b808b937b456cff03c3e6981cb0e783a4035e6100eca2ad51411aa43518560ab8e2645b8591c34835623597dd187d75468f97
+  data.tar.gz: 6baf99270d4261595eb34817fb964cb528b8d420d9caf214dddf475142e0ad5339e4773e4ff25fa993b6c0863076d32af279f0e025bf81343d166c04d8fe24ca

data/VERSION

@@ -1 +1 @@
-9.0.1
+9.0.2

data/lib/gitlab_git/commit.rb

@@ -10,7 +10,8 @@ module Gitlab
         :id, :message, :parent_ids,
         :authored_date, :author_name, :author_email,
         :committed_date, :committer_name, :committer_email
-      ]
+      ].freeze
+
       attr_accessor *SERIALIZE_KEYS
 
       def ==(other)
@@ -119,11 +120,11 @@ module Gitlab
           break_rewrites = options[:break_rewrites]
           actual_options = Diff.filter_diff_options(options)
 
-          if rugged_commit.parents.empty?
-            diff = rugged_commit.diff(actual_options.merge(reverse: true))
-          else
-            diff = rugged_commit.parents[0].diff(rugged_commit, actual_options)
-          end
+          diff = if rugged_commit.parents.empty?
+                   rugged_commit.diff(actual_options.merge(reverse: true))
+                 else
+                   rugged_commit.parents[0].diff(rugged_commit, actual_options)
+                 end
 
           diff.find_similar!(break_rewrites: break_rewrites)
           diff

data/lib/gitlab_git/diff.rb

@@ -9,7 +9,7 @@ module Gitlab
       attr_accessor :old_path, :new_path, :a_mode, :b_mode, :diff
 
       # Stats properties
-      attr_accessor  :new_file, :renamed_file, :deleted_file
+      attr_accessor :new_file, :renamed_file, :deleted_file
 
       class << self
         def between(repo, head, base, options = {}, *paths)
@@ -169,7 +169,7 @@ module Gitlab
       end
 
       def serialize_keys
-        @serialize_keys ||= %w(diff new_path old_path a_mode b_mode new_file renamed_file deleted_file).map(&:to_sym)
+        @serialize_keys ||= %i(diff new_path old_path a_mode b_mode new_file renamed_file deleted_file)
       end
 
       def to_hash
@@ -222,7 +222,7 @@ module Gitlab
         # 'Binary'
         diff_text.sub!(/\A.*?^(---|Binary)/m, '\1')
 
-        if diff_text.start_with?('---') or diff_text.start_with?('Binary')
+        if diff_text.start_with?('---', 'Binary')
           diff_text
         else
           # If the diff_text did not contain a line starting with '---' or

data/lib/gitlab_git/repository.rb

@@ -785,8 +785,10 @@ module Gitlab
         from_sha = rugged.rev_parse_oid(from)
         to_sha = rugged.rev_parse_oid(to)
         commits_between(from_sha, to_sha).map do |commit|
-          commit.to_mbox(actual_options)
-        end.join("\n")
+          # 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
@@ -947,7 +949,7 @@ module Gitlab
 
         current = ""
         content.split("\n").each do |txt|
-          if txt.match(/^\s*\[/)
+          if txt =~ /^\s*\[/
             current = txt.match(/(?<=").*(?=")/)[0]
             results[current] = {}
           else

data/lib/gitlab_git/util.rb

@@ -1,7 +1,7 @@
 module Gitlab
   module Git
     module Util
-      LINE_SEP = "\n"
+      LINE_SEP = "\n".freeze
 
       def self.count_lines(string)
         case string[-1]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 9.0.1
+  version: 9.0.2
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-linguist
@@ -111,9 +111,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Gitlab::Git library
 test_files: []
-has_rdoc: