From 794b4c5579075ec5361b4ab864052d0717b29492 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Thu, 21 Sep 2017 07:22:12 -0400
Subject: Ensure that Blob.raw returns always returns a valid blob object

In gitlab-org/gitlab-ee!2976, we saw that a given OID could point
to a commit, which would cause the delta size check to fail.
Gitaly already returns nil if the OID isn't a blob, so this change
makes the Rugged implementation consistent.
---
 lib/gitlab/git/blob.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib/gitlab/git/blob.rb')

diff --git a/lib/gitlab/git/blob.rb b/lib/gitlab/git/blob.rb
index 8d96826f6ee..a4336facee5 100644
--- a/lib/gitlab/git/blob.rb
+++ b/lib/gitlab/git/blob.rb
@@ -32,6 +32,8 @@ module Gitlab
             else
               blob = repository.lookup(sha)
 
+              next unless blob.is_a?(Rugged::Blob)
+
               new(
                 id: blob.oid,
                 size: blob.size,
-- 
cgit v1.2.1