diff.rb in gitlab_git-5.4.0

- old
+ new

@@ -2,11 +2,11 @@
 # We dont want to use grit objects inside app/
 # It helps us easily migrate to rugged in future
 module Gitlab
   module Git
     class Diff
-      BROKEN_DIFF = "--broken-diff"
+      class TimeoutError < StandardError; end
 
       attr_accessor :raw_diff
 
       # Diff properties
       attr_accessor :old_path, :new_path, :a_mode, :b_mode, :diff
@@ -23,10 +23,10 @@
 
           repo.diff(common_commit, head, *paths).map do |diff|
             Gitlab::Git::Diff.new(diff)
           end
         rescue Grit::Git::GitTimeout
-          [Gitlab::Git::Diff::BROKEN_DIFF]
+          raise TimeoutError.new("Diff.between exited with timeout")
         end
       end
 
       def initialize(raw_diff)
         raise "Nil as raw diff passed" unless raw_diff