gitlab_git 10.6.7 → 10.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c813eed6119af1e3d95118a8ad959564f086112
-  data.tar.gz: 43e5e98c37ac60b3d0fa0961adb0f4100e0fb7ab
+  metadata.gz: c0988bb5a3617f4bac08f53781bea813be09c7a9
+  data.tar.gz: 0ce71e0cf618cf267c0b2ef057cb6153026b6274
 SHA512:
-  metadata.gz: be00e50a22b77ea27b52dc3ea4dce30d78c63d5ea5e8144a9c6c4e999800bee02e92caf391b6f5228aec78924ee17c60305119b01aa44364badb761cd4f1dae1
-  data.tar.gz: 10e1613716b5d75487f608596f6d079d4c6c63445844cfbfcbb5c681327d78b1159803348feaaaa0b0b59bd4cf5836dee46644884d81d9e303950eb6e6d110d3
+  metadata.gz: 241ab6732a48d690d39a71d57d8bc311fa7ea7dc5b6fe992fb71ea1e31b407166203c16ebb48762a688933c0a014d92c4138ac1d3abbdaab46e2ecda80f20be6
+  data.tar.gz: 904a3b9e9f1c2ded3568c3fbd697bbda11f3c2b20c0fe903bdfeb9cdcd1a89cf386f96c0c6a20dcf4080638798961b6a7b36235e70d5ae94bd00b3c6521d75c5

data/VERSION

@@ -1 +1 @@
-10.6.7
+10.6.8

data/lib/gitlab_git/compare.rb

@@ -1,10 +1,11 @@
 module Gitlab
   module Git
     class Compare
-      attr_reader :head, :base
+      attr_reader :head, :base, :straight
 
-      def initialize(repository, base, head)
+      def initialize(repository, base, head, straight = false)
         @repository = repository
+        @straight = straight
 
         unless base && head
           @commits = []
@@ -34,6 +35,7 @@ module Gitlab
         end
 
         paths = options.delete(:paths) || []
+        options[:straight] = @straight
         Gitlab::Git::Diff.between(@repository, @head.id, @base.id, options, *paths)
       end
     end

data/lib/gitlab_git/diff.rb

@@ -21,13 +21,22 @@ module Gitlab
 
       class << self
         def between(repo, head, base, options = {}, *paths)
-          # Only show what is new in the source branch compared to the target branch, not the other way around.
-          # The linex below with merge_base is equivalent to diff with three dots (git diff branch1...branch2)
-          # From the git documentation: "git diff A...B" is equivalent to "git diff $(git-merge-base A B) B"
-          common_commit = repo.merge_base_commit(head, base)
+          straight = options.delete(:straight) || false
+
+          common_commit = if straight
+                            base
+                          else
+                            # Only show what is new in the source branch
+                            # compared to the target branch, not the other way
+                            # around. The linex below with merge_base is
+                            # equivalent to diff with three dots (git diff
+                            # branch1...branch2) From the git documentation:
+                            # "git diff A...B" is equivalent to "git diff
+                            # $(git-merge-base A B) B"
+                            repo.merge_base_commit(head, base)
+                          end
 
           options ||= {}
-          break_rewrites = options[:break_rewrites]
           actual_options = filter_diff_options(options)
           repo.diff(common_commit, head, actual_options, *paths)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 10.6.7
+  version: 10.6.8
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2016-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-linguist
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Gitlab::Git library