gitlab-grit 2.6.8 → 2.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f69580427dd5b4328c6e266449a5b986344e4df5
-  data.tar.gz: 250daa41237a32b55338f79ca9c29d6032b63583
+  metadata.gz: 91628dfa7d6ccd4bdf412c0c38315137910bfc89
+  data.tar.gz: 000bd780528b454afe3eca1e92ba94ae82c13513
 SHA512:
-  metadata.gz: dcb320e87327ed42a86dda01462e28d53ca5c8a0526a7a966d77565c3b588f71056dfa74f29a0956b01020bfb2a72e95a46641f5d11c2bdb0dee65015adb133a
-  data.tar.gz: cc4843bc9c074efccdb8400cfd86323beb0b49ac815aef5dedeee10e241dd305f93b576af220648036c0a341053e97ec6fd9bdc61303bcd0d2b612d33c4edb95
+  metadata.gz: 83b5a66fbdaa910c62f8dc31bd3f53ad8735a95b596a5f74d711b501d60cf04c1ac96dd3afbf3474b681af47abf309c4c48a7d38e5aa0d6288d33b1b6a4bb50a
+  data.tar.gz: 109ddf8ab210e7e3b00167273324046572bfe31821a1fd86df9918697a86f58ebcb6dfe187b1a9adc005ba091b5bcc7d4701c1850ef76c77af7389ae1ad54f59

data/VERSION

@@ -1 +1 @@
-2.6.8
+2.6.9

data/lib/grit/commit.rb

@@ -146,7 +146,7 @@ module Grit
         # GITLAB patch
         # Skip all garbage unless we get real commit
         while !lines.empty? && lines.first !~ /^commit [a-zA-Z0-9]*$/
-          lines.shift 
+          lines.shift
         end
 
         id = lines.shift.split.last
@@ -214,8 +214,8 @@ module Grit
         diff = @repo.git.show({:full_index => true, :pretty => 'raw'}, @id)
       end
 
-      if diff =~ /diff --git "?a/
-        diff = diff.sub(/.+?(diff --git "?a)/m, '\1')
+      if diff =~ /diff --git a/
+        diff = diff.sub(/.*?(diff --git a)/m, '\1')
       else
         diff = ''
       end
@@ -228,11 +228,7 @@ module Grit
     #
     # Returns Grit::Diff[] (baked)
     def diffs(options = {})
-      if parents.empty?
-        show
-      else
-        self.class.diff(@repo, parents.first.id, @id, [], options)
-      end
+      show
     end
 
     def stats

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-grit
 version: !ruby/object:Gem::Version
-  version: 2.6.8
+  version: 2.6.9
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: charlock_holmes