gitlab_git 10.2.1 → 10.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c94b6a55ac8082363a377e7a9a7cc8c0d98638d
-  data.tar.gz: 75535b754be9e04d1d4ed19e718c502241221f03
+  metadata.gz: 668689e725fe84e3a117357e3844505f71b0d394
+  data.tar.gz: b9685279000d370fbeb8a7ad6e25e23f05977151
 SHA512:
-  metadata.gz: 50ffd69f42646ba5f2c9c293127d64590744f965b33b158e543bc36c1673eb2da9af5dea7ae3abb94692afd5bc51fd888db8712191eabb80a162be44c66929ab
-  data.tar.gz: cd9d15af5c913484f62c0e18fd1a1962a28eff08d918f533427c55a4c954eefd826d7efc5276e150daa44f9c1ba7775aacf860839e885797e7d32e64b1341c5e
+  metadata.gz: 1d869356e432d100243f5538a9324c87adb9e7689ba9643e0f4273d7910873ca2beb9f97c3b02508ce725fb67078055805e338fed026724b7b7b2a0c5d47d8ea
+  data.tar.gz: b66a6b0eb24ce0c0fcf1fac52fb09d5521cb918a083e2a52deb05b2c65f3c1872818246ac07f6254f061c879ae0560f3dc61ad6d7048b7cdb045cf63856dea27

data/VERSION

@@ -1 +1 @@
-10.2.1
+10.2.2

data/lib/gitlab_git/repository.rb

@@ -809,6 +809,22 @@ 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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 10.2.1
+  version: 10.2.2
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
@@ -130,3 +130,4 @@ signing_key:
 specification_version: 4
 summary: Gitlab::Git library
 test_files: []
+has_rdoc: