Merge branch 'jc-modify-find-blobs' into 'master'

Modify GetBlobs RPC to return type

Closes #1608

See merge request gitlab-org/gitaly!1445

7 files changed, 141 insertions, 80 deletions

diff --git a/changelogs/unreleased/jc-modify-find-blobs.yml b/changelogs/unreleased/jc-modify-find-blobs.yml
new file mode 100644
index 000000000..183ec90fc
--- /dev/null
+++ b/changelogs/unreleased/jc-modify-find-blobs.yml
@@ -0,0 +1,5 @@
+---
+title: Modify GetBlobs RPC to return type
+merge_request: 1445
+author:
+type: performance
diff --git a/internal/service/blob/get_blobs.go b/internal/service/blob/get_blobs.go
index dc1877ad4..ec588e273 100644
--- a/internal/service/blob/get_blobs.go
+++ b/internal/service/blob/get_blobs.go
@@ -1,6 +1,7 @@
 package blob
 
 import (
+	"bytes"
 	"io"
 	"io/ioutil"
 
@@ -13,6 +14,11 @@ import (
 	"google.golang.org/grpc/status"
 )
 
+var treeEntryToObjectType = map[gitalypb.TreeEntry_EntryType]gitalypb.ObjectType{
+	gitalypb.TreeEntry_BLOB:   gitalypb.ObjectType_BLOB,
+	gitalypb.TreeEntry_TREE:   gitalypb.ObjectType_TREE,
+	gitalypb.TreeEntry_COMMIT: gitalypb.ObjectType_COMMIT}
+
 func sendGetBlobsResponse(req *gitalypb.GetBlobsRequest, stream gitalypb.BlobService_GetBlobsServer, c *catfile.Batch) error {
 	tef := commit.NewTreeEntryFinder(c)
 
@@ -20,6 +26,10 @@ func sendGetBlobsResponse(req *gitalypb.GetBlobsRequest, stream gitalypb.BlobSer
 		revision := revisionPath.Revision
 		path := revisionPath.Path
 
+		if len(path) > 1 {
+			path = bytes.TrimRight(path, "/")
+		}
+
 		treeEntry, err := tef.FindByRevisionAndPath(revision, string(path))
 		if err != nil {
 			return err
@@ -40,6 +50,7 @@ func sendGetBlobsResponse(req *gitalypb.GetBlobsRequest, stream gitalypb.BlobSer
 
 		if treeEntry.Type == gitalypb.TreeEntry_COMMIT {
 			response.IsSubmodule = true
+			response.Type = gitalypb.ObjectType_COMMIT
 
 			if err := stream.Send(response); err != nil {
 				return status.Errorf(codes.Unavailable, "GetBlobs: send: %v", err)
@@ -52,54 +63,74 @@ func sendGetBlobsResponse(req *gitalypb.GetBlobsRequest, stream gitalypb.BlobSer
 		if err != nil {
 			return status.Errorf(codes.Internal, "GetBlobs: %v", err)
 		}
-		if objectInfo.Type != "blob" {
-			return status.Errorf(codes.InvalidArgument, "GetBlobs: object at %s:%s is %s, not blob", revision, path, objectInfo.Type)
-		}
 
 		response.Size = objectInfo.Size
 
-		var readLimit int64
-		if req.Limit < 0 || req.Limit > objectInfo.Size {
-			readLimit = objectInfo.Size
-		} else {
-			readLimit = req.Limit
+		var ok bool
+		response.Type, ok = treeEntryToObjectType[treeEntry.Type]
+
+		if !ok {
+			continue
 		}
 
-		// For correctness it does not matter, but for performance, the order is
-		// important: first check if readlimit == 0, if not, only then create
-		// blobReader.
-		if readLimit == 0 {
+		if response.Type != gitalypb.ObjectType_BLOB {
 			if err := stream.Send(response); err != nil {
 				return status.Errorf(codes.Unavailable, "GetBlobs: send: %v", err)
 			}
 			continue
 		}
 
-		blobReader, err := c.Blob(objectInfo.Oid)
-		if err != nil {
-			return status.Errorf(codes.Internal, "GetBlobs: %v", err)
+		if err = sendBlobTreeEntry(response, stream, c, req.GetLimit()); err != nil {
+			return err
 		}
+	}
 
-		sw := streamio.NewWriter(func(p []byte) error {
-			msg := &gitalypb.GetBlobsResponse{}
-			if response != nil {
-				msg = response
-				response = nil
-			}
+	return nil
+}
 
-			msg.Data = p
+func sendBlobTreeEntry(response *gitalypb.GetBlobsResponse, stream gitalypb.BlobService_GetBlobsServer, c *catfile.Batch, limit int64) error {
 
-			return stream.Send(msg)
-		})
+	var readLimit int64
+	if limit < 0 || limit > response.Size {
+		readLimit = response.Size
+	} else {
+		readLimit = limit
+	}
 
-		_, err = io.CopyN(sw, blobReader, readLimit)
-		if err != nil {
+	// For correctness it does not matter, but for performance, the order is
+	// important: first check if readlimit == 0, if not, only then create
+	// blobReader.
+	if readLimit == 0 {
+		if err := stream.Send(response); err != nil {
 			return status.Errorf(codes.Unavailable, "GetBlobs: send: %v", err)
 		}
+		return nil
+	}
+
+	blobReader, err := c.Blob(response.Oid)
+	if err != nil {
+		return status.Errorf(codes.Internal, "GetBlobs: %v", err)
+	}
 
-		if _, err := io.Copy(ioutil.Discard, blobReader); err != nil {
-			return status.Errorf(codes.Unavailable, "GetBlobs: discarding data: %v", err)
+	sw := streamio.NewWriter(func(p []byte) error {
+		msg := &gitalypb.GetBlobsResponse{}
+		if response != nil {
+			msg = response
+			response = nil
 		}
+
+		msg.Data = p
+
+		return stream.Send(msg)
+	})
+
+	_, err = io.CopyN(sw, blobReader, readLimit)
+	if err != nil {
+		return status.Errorf(codes.Unavailable, "GetBlobs: send: %v", err)
+	}
+
+	if _, err := io.Copy(ioutil.Discard, blobReader); err != nil {
+		return status.Errorf(codes.Unavailable, "GetBlobs: discarding data: %v", err)
 	}
 
 	return nil
diff --git a/internal/service/blob/get_blobs_test.go b/internal/service/blob/get_blobs_test.go
index da532e0df..8b7199731 100644
--- a/internal/service/blob/get_blobs_test.go
+++ b/internal/service/blob/get_blobs_test.go
@@ -28,18 +28,21 @@ func TestSuccessfulGetBlobsRequest(t *testing.T) {
 			Size: 22846,
 			Oid:  "53855584db773c3df5b5f61f72974cb298822fbb",
 			Mode: 0100644,
+			Type: gitalypb.ObjectType_BLOB,
 		},
 		{
 			Path: []byte("files/lfs/lfs_object.iso"),
 			Size: 133,
 			Oid:  "0c304a93cb8430108629bbbcaa27db3343299bc0",
 			Mode: 0100644,
+			Type: gitalypb.ObjectType_BLOB,
 		},
 		{
 			Path: []byte("files/big-lorem.txt"),
 			Size: 30602785,
 			Oid:  "c9d591740caed845a78ed529fadb3fb96c920cb2",
 			Mode: 0100644,
+			Type: gitalypb.ObjectType_BLOB,
 		},
 		{
 			Path:        []byte("six"),
@@ -47,6 +50,15 @@ func TestSuccessfulGetBlobsRequest(t *testing.T) {
 			Oid:         "409f37c4f05865e4fb208c771485f211a22c4c2d",
 			Mode:        0160000,
 			IsSubmodule: true,
+			Type:        gitalypb.ObjectType_COMMIT,
+		},
+		{
+			Path:        []byte("files"),
+			Size:        268,
+			Oid:         "21cac26406a56d724ad3eeed4f90cf9b48edb992",
+			Mode:        0040000,
+			IsSubmodule: false,
+			Type:        gitalypb.ObjectType_TREE,
 		},
 	}
 	revision := "ef16b8d2b204706bd8dc211d4011a5bffb6fc0c2"
@@ -101,10 +113,10 @@ func TestSuccessfulGetBlobsRequest(t *testing.T) {
 			require.Equal(t, 2, len(nonExistentBlobs))
 			require.Equal(t, len(expectedBlobs), len(receivedBlobs))
 
-			for i, receviedBlob := range receivedBlobs {
+			for i, receivedBlob := range receivedBlobs {
 				expectedBlob := expectedBlobs[i]
 				expectedBlob.Revision = revision
-				if !expectedBlob.IsSubmodule {
+				if !expectedBlob.IsSubmodule && expectedBlob.Type == gitalypb.ObjectType_BLOB {
 					expectedBlob.Data = testhelper.MustReadFile(t, path.Join(testRepoPath, "blobs-sandbox", string(expectedBlob.Path)))
 				}
 				if limit == 0 {
@@ -114,7 +126,7 @@ func TestSuccessfulGetBlobsRequest(t *testing.T) {
 					expectedBlob.Data = expectedBlob.Data[:limit]
 				}
 
-				require.Equal(t, expectedBlob, receviedBlob)
+				require.Equal(t, expectedBlob, receivedBlob)
 			}
 		})
 	}
diff --git a/internal/service/commit/tree_entry.go b/internal/service/commit/tree_entry.go
index 8498b8436..b7e560d29 100644
--- a/internal/service/commit/tree_entry.go
+++ b/internal/service/commit/tree_entry.go
@@ -115,6 +115,7 @@ func (s *server) TreeEntry(in *gitalypb.TreeEntryRequest, stream gitalypb.Commit
 	}
 
 	c, err := catfile.New(stream.Context(), in.Repository)
+
 	if err != nil {
 		return err
 	}
diff --git a/proto/blob.proto b/proto/blob.proto
index f8bb1b92a..83edd83bc 100644
--- a/proto/blob.proto
+++ b/proto/blob.proto
@@ -85,6 +85,7 @@ message GetBlobsResponse {
   int32 mode = 5;
   string revision = 6;
   bytes path = 7;
+  ObjectType type = 8;
 }
 
 message LFSPointer {
diff --git a/proto/go/gitalypb/blob.pb.go b/proto/go/gitalypb/blob.pb.go
index 2dd4ae9fa..f585c129a 100644
--- a/proto/go/gitalypb/blob.pb.go
+++ b/proto/go/gitalypb/blob.pb.go
@@ -249,14 +249,15 @@ type GetBlobsResponse struct {
 	// Chunk of blob data, could span over multiple messages.
 	Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"`
 	// Object ID of the current blob. Only present on the first message per blob. Empty if no blob was found.
-	Oid                  string   `protobuf:"bytes,3,opt,name=oid,proto3" json:"oid,omitempty"`
-	IsSubmodule          bool     `protobuf:"varint,4,opt,name=is_submodule,json=isSubmodule,proto3" json:"is_submodule,omitempty"`
-	Mode                 int32    `protobuf:"varint,5,opt,name=mode,proto3" json:"mode,omitempty"`
-	Revision             string   `protobuf:"bytes,6,opt,name=revision,proto3" json:"revision,omitempty"`
-	Path                 []byte   `protobuf:"bytes,7,opt,name=path,proto3" json:"path,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	Oid                  string     `protobuf:"bytes,3,opt,name=oid,proto3" json:"oid,omitempty"`
+	IsSubmodule          bool       `protobuf:"varint,4,opt,name=is_submodule,json=isSubmodule,proto3" json:"is_submodule,omitempty"`
+	Mode                 int32      `protobuf:"varint,5,opt,name=mode,proto3" json:"mode,omitempty"`
+	Revision             string     `protobuf:"bytes,6,opt,name=revision,proto3" json:"revision,omitempty"`
+	Path                 []byte     `protobuf:"bytes,7,opt,name=path,proto3" json:"path,omitempty"`
+	Type                 ObjectType `protobuf:"varint,8,opt,name=type,proto3,enum=gitaly.ObjectType" json:"type,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
 }
 
 func (m *GetBlobsResponse) Reset()         { *m = GetBlobsResponse{} }
@@ -333,6 +334,13 @@ func (m *GetBlobsResponse) GetPath() []byte {
 	return nil
 }
 
+func (m *GetBlobsResponse) GetType() ObjectType {
+	if m != nil {
+		return m.Type
+	}
+	return ObjectType_UNKNOWN
+}
+
 type LFSPointer struct {
 	Size                 int64    `protobuf:"varint,1,opt,name=size,proto3" json:"size,omitempty"`
 	Data                 []byte   `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"`
@@ -745,47 +753,49 @@ func init() {
 func init() { proto.RegisterFile("blob.proto", fileDescriptor_6903d1e8a20272e8) }
 
 var fileDescriptor_6903d1e8a20272e8 = []byte{
-	// 636 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xcd, 0x4e, 0xdb, 0x40,
-	0x10, 0xd6, 0x62, 0x02, 0xc9, 0x24, 0x50, 0xba, 0x6a, 0xc1, 0x58, 0x2d, 0x32, 0x56, 0x0f, 0xbe,
-	0x34, 0xa1, 0xa9, 0x7a, 0xad, 0x04, 0x07, 0x22, 0x4a, 0x05, 0x68, 0xb9, 0x55, 0x95, 0x22, 0x1b,
-	0x6f, 0x60, 0xd1, 0xc6, 0xeb, 0x7a, 0x17, 0x10, 0x7d, 0x91, 0x3e, 0x48, 0xef, 0x7d, 0x84, 0x3e,
-	0x47, 0x9f, 0xa1, 0xa7, 0xca, 0xeb, 0x9f, 0xd8, 0x89, 0xd3, 0x8b, 0xdb, 0xdb, 0xec, 0xcc, 0xce,
-	0x7c, 0xdf, 0xcc, 0x7c, 0x5e, 0x03, 0xf8, 0x5c, 0xf8, 0xfd, 0x28, 0x16, 0x4a, 0xe0, 0xb5, 0x6b,
-	0xa6, 0x3c, 0xfe, 0x68, 0xf5, 0xe4, 0x8d, 0x17, 0xd3, 0x20, 0xf5, 0x3a, 0x1c, 0x36, 0x47, 0x54,
-	0x1d, 0x71, 0xe1, 0x13, 0xfa, 0xe5, 0x8e, 0x4a, 0x85, 0x87, 0x00, 0x31, 0x8d, 0x84, 0x64, 0x4a,
-	0xc4, 0x8f, 0x26, 0xb2, 0x91, 0xdb, 0x1d, 0xe2, 0x7e, 0x9a, 0xdc, 0x27, 0x45, 0x84, 0x94, 0x6e,
-	0xe1, 0x2d, 0x30, 0x04, 0x0b, 0xcc, 0x15, 0x1b, 0xb9, 0x1d, 0x92, 0x98, 0xf8, 0x19, 0xb4, 0x38,
-	0x9b, 0x32, 0x65, 0x1a, 0x36, 0x72, 0x0d, 0x92, 0x1e, 0x9c, 0x53, 0x78, 0x52, 0xa0, 0xc9, 0x48,
-	0x84, 0x92, 0x62, 0x0c, 0xab, 0x92, 0x7d, 0xa5, 0x1a, 0xc8, 0x20, 0xda, 0x4e, 0x7c, 0x81, 0xa7,
-	0x3c, 0x5d, 0xaf, 0x47, 0xb4, 0x9d, 0x43, 0x18, 0x05, 0x84, 0xf3, 0x0b, 0x15, 0xd5, 0x64, 0x13,
-	0xf2, 0xa7, 0xb0, 0x19, 0xd3, 0x7b, 0x26, 0x99, 0x08, 0xc7, 0x91, 0xa7, 0x6e, 0xa4, 0xb9, 0x62,
-	0x1b, 0x6e, 0x77, 0xf8, 0x2a, 0xcf, 0x9b, 0x03, 0xe9, 0x93, 0xec, 0xf6, 0x85, 0xa7, 0x6e, 0xc8,
-	0x46, 0x5c, 0x3a, 0xc9, 0xfa, 0xbe, 0xad, 0xf7, 0xd0, 0x2b, 0x27, 0x61, 0x0b, 0xda, 0x79, 0x9a,
-	0x26, 0xd9, 0x21, 0xc5, 0x39, 0x69, 0x3e, 0x61, 0x91, 0x37, 0x9f, 0xd8, 0xce, 0x77, 0x04, 0x5b,
-	0x33, 0x16, 0x4d, 0x27, 0x87, 0xf7, 0xa1, 0xc7, 0xe4, 0x58, 0xde, 0xf9, 0x53, 0x11, 0xdc, 0x71,
-	0x6a, 0xae, 0xda, 0xc8, 0x6d, 0x93, 0x2e, 0x93, 0x97, 0xb9, 0x2b, 0x29, 0x34, 0x15, 0x01, 0x35,
-	0x5b, 0x36, 0x72, 0x5b, 0x44, 0xdb, 0x15, 0xd6, 0x6b, 0x4b, 0x58, 0xaf, 0x97, 0x58, 0x1f, 0x03,
-	0x7c, 0x3c, 0xbe, 0xbc, 0x10, 0x2c, 0x54, 0x34, 0x6e, 0xb0, 0xe8, 0x13, 0xd8, 0x38, 0xa3, 0x0f,
-	0x49, 0xf3, 0xe7, 0xfe, 0x2d, 0xbd, 0x52, 0xb5, 0xa5, 0x16, 0x25, 0x98, 0x53, 0x32, 0x4a, 0x94,
-	0x26, 0xf0, 0x7c, 0x44, 0xd5, 0x8c, 0x55, 0x23, 0xe1, 0xec, 0x42, 0x3b, 0xf9, 0xbe, 0xc6, 0x2c,
-	0x48, 0x25, 0xd3, 0x21, 0xeb, 0xc9, 0xf9, 0x24, 0x90, 0xce, 0x39, 0x6c, 0xcf, 0xe3, 0x64, 0x5b,
-	0x7b, 0x07, 0x3d, 0x3e, 0x91, 0xe3, 0x28, 0xf3, 0x9b, 0x48, 0x6b, 0xad, 0x80, 0x9a, 0xa5, 0x90,
-	0x2e, 0x9f, 0xc8, 0x3c, 0xdd, 0xf9, 0x81, 0xc0, 0x1c, 0x51, 0x75, 0x46, 0x1f, 0xfe, 0x11, 0xf9,
-	0xf2, 0x32, 0xd3, 0xf1, 0xcf, 0x96, 0x59, 0x11, 0x71, 0x2b, 0x13, 0x31, 0x7e, 0x01, 0x10, 0x0a,
-	0x35, 0x66, 0xe1, 0xd8, 0xe3, 0x3c, 0xd3, 0x4c, 0x3b, 0x14, 0xea, 0x24, 0x3c, 0xe4, 0x1c, 0xef,
-	0x41, 0x37, 0x8b, 0xc6, 0x74, 0x22, 0xcd, 0x96, 0x6d, 0xb8, 0x3d, 0xd2, 0xd1, 0x61, 0x42, 0x27,
-	0xd2, 0x21, 0xb0, 0x5b, 0xc3, 0xbf, 0xd9, 0x50, 0x6e, 0xf5, 0x4c, 0x0e, 0x39, 0xff, 0xff, 0x33,
-	0xc9, 0xf8, 0xcf, 0x63, 0x35, 0xe2, 0x3f, 0xfc, 0x69, 0x40, 0x37, 0x91, 0xf5, 0x25, 0x8d, 0xef,
-	0xd9, 0x15, 0xc5, 0x23, 0x58, 0xcf, 0xbe, 0x72, 0xbc, 0x3d, 0xf7, 0xf8, 0x64, 0x6d, 0x59, 0x3b,
-	0x0b, 0xfe, 0x94, 0x82, 0xd3, 0xf9, 0xfd, 0xcd, 0x6d, 0xb5, 0x57, 0x2c, 0xf4, 0xe6, 0x00, 0xe1,
-	0x0f, 0xd0, 0xce, 0x9f, 0x0b, 0xbc, 0xb3, 0xe4, 0x19, 0xb3, 0xcc, 0xc5, 0x40, 0x5d, 0xad, 0xcf,
-	0xfa, 0x0f, 0x51, 0xea, 0x1a, 0xbf, 0x2c, 0x25, 0x2e, 0x4e, 0xde, 0xda, 0x5b, 0x16, 0xae, 0xab,
-	0x4e, 0xe1, 0xe9, 0x82, 0x2c, 0xb0, 0x5d, 0xaa, 0x50, 0xab, 0x78, 0x6b, 0xff, 0x2f, 0x37, 0x96,
-	0xc3, 0x54, 0xb7, 0x57, 0x81, 0xa9, 0x15, 0x51, 0x05, 0xa6, 0x7e, 0xf5, 0x15, 0x98, 0xa3, 0x83,
-	0x4f, 0x49, 0x02, 0xf7, 0xfc, 0xfe, 0x95, 0x98, 0x0e, 0x52, 0xf3, 0xb5, 0x88, 0xaf, 0x07, 0x69,
-	0x99, 0x81, 0xfe, 0xe7, 0x0e, 0xae, 0x45, 0x76, 0x8e, 0x7c, 0x7f, 0x4d, 0xbb, 0xde, 0xfe, 0x09,
-	0x00, 0x00, 0xff, 0xff, 0x2a, 0xce, 0xc4, 0x0f, 0xaa, 0x07, 0x00, 0x00,
+	// 659 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xc1, 0x6e, 0xd3, 0x40,
+	0x10, 0xd5, 0xd6, 0x4d, 0xeb, 0x4c, 0xd2, 0x52, 0x56, 0xd0, 0xba, 0x16, 0x54, 0xae, 0x85, 0x90,
+	0x2f, 0x24, 0x25, 0x88, 0x2b, 0x52, 0x7b, 0x68, 0x54, 0x8a, 0xda, 0x6a, 0xcb, 0x09, 0x21, 0x45,
+	0x76, 0xbd, 0x69, 0xb7, 0xda, 0x78, 0x8d, 0x77, 0xdb, 0x2a, 0xfc, 0x08, 0x7f, 0xc3, 0x27, 0xf0,
+	0x03, 0xfc, 0x00, 0xdf, 0xc0, 0x09, 0x79, 0x6d, 0x27, 0x4e, 0xe2, 0x70, 0x31, 0xdc, 0x66, 0x67,
+	0x76, 0xe6, 0xbd, 0x99, 0x79, 0x5e, 0x03, 0x04, 0x5c, 0x04, 0x9d, 0x38, 0x11, 0x4a, 0xe0, 0xb5,
+	0x6b, 0xa6, 0x7c, 0x3e, 0xb6, 0xdb, 0xf2, 0xc6, 0x4f, 0x68, 0x98, 0x79, 0x5d, 0x0e, 0x9b, 0x7d,
+	0xaa, 0x8e, 0xb8, 0x08, 0x08, 0xfd, 0x72, 0x47, 0xa5, 0xc2, 0x3d, 0x80, 0x84, 0xc6, 0x42, 0x32,
+	0x25, 0x92, 0xb1, 0x85, 0x1c, 0xe4, 0xb5, 0x7a, 0xb8, 0x93, 0x25, 0x77, 0xc8, 0x24, 0x42, 0x4a,
+	0xb7, 0xf0, 0x16, 0x18, 0x82, 0x85, 0xd6, 0x8a, 0x83, 0xbc, 0x26, 0x49, 0x4d, 0xfc, 0x04, 0x1a,
+	0x9c, 0x8d, 0x98, 0xb2, 0x0c, 0x07, 0x79, 0x06, 0xc9, 0x0e, 0xee, 0x29, 0x3c, 0x9a, 0xa0, 0xc9,
+	0x58, 0x44, 0x92, 0x62, 0x0c, 0xab, 0x92, 0x7d, 0xa5, 0x1a, 0xc8, 0x20, 0xda, 0x4e, 0x7d, 0xa1,
+	0xaf, 0x7c, 0x5d, 0xaf, 0x4d, 0xb4, 0x5d, 0x40, 0x18, 0x13, 0x08, 0xf7, 0x17, 0x9a, 0x54, 0x93,
+	0x75, 0xc8, 0x9f, 0xc2, 0x66, 0x42, 0xef, 0x99, 0x64, 0x22, 0x1a, 0xc4, 0xbe, 0xba, 0x91, 0xd6,
+	0x8a, 0x63, 0x78, 0xad, 0xde, 0x8b, 0x22, 0x6f, 0x0e, 0xa4, 0x43, 0xf2, 0xdb, 0x17, 0xbe, 0xba,
+	0x21, 0x1b, 0x49, 0xe9, 0x24, 0xab, 0xfb, 0xb6, 0xdf, 0x41, 0xbb, 0x9c, 0x84, 0x6d, 0x30, 0x8b,
+	0x34, 0x4d, 0xb2, 0x49, 0x26, 0xe7, 0xb4, 0xf9, 0x94, 0x45, 0xd1, 0x7c, 0x6a, 0xbb, 0x3f, 0x11,
+	0x6c, 0x4d, 0x59, 0xd4, 0x9d, 0x1c, 0xde, 0x87, 0x36, 0x93, 0x03, 0x79, 0x17, 0x8c, 0x44, 0x78,
+	0xc7, 0xa9, 0xb5, 0xea, 0x20, 0xcf, 0x24, 0x2d, 0x26, 0x2f, 0x0b, 0x57, 0x5a, 0x68, 0x24, 0x42,
+	0x6a, 0x35, 0x1c, 0xe4, 0x35, 0x88, 0xb6, 0x67, 0x58, 0xaf, 0x2d, 0x61, 0xbd, 0x3e, 0x65, 0x8d,
+	0x5f, 0xc2, 0xaa, 0x1a, 0xc7, 0xd4, 0x32, 0x1d, 0xe4, 0x6d, 0x4e, 0xd7, 0x70, 0x1e, 0xdc, 0xd2,
+	0x2b, 0xf5, 0x71, 0x1c, 0x53, 0xa2, 0xe3, 0xee, 0x31, 0xc0, 0x87, 0xe3, 0xcb, 0x0b, 0xc1, 0x22,
+	0x45, 0x93, 0x1a, 0x82, 0x38, 0x81, 0x8d, 0x33, 0xfa, 0x90, 0x0e, 0x29, 0x83, 0xa8, 0x2c, 0xb5,
+	0x28, 0xd5, 0x82, 0xba, 0x51, 0x1a, 0xf8, 0x10, 0x9e, 0xf6, 0xa9, 0x9a, 0xb2, 0xaa, 0x25, 0xb0,
+	0x5d, 0x30, 0xd3, 0xef, 0x70, 0xc0, 0xc2, 0x4c, 0x5a, 0x4d, 0xb2, 0x9e, 0x9e, 0x4f, 0x42, 0xe9,
+	0x9e, 0xc3, 0xf6, 0x3c, 0x4e, 0xbe, 0xdd, 0xb7, 0xd0, 0xe6, 0x43, 0x39, 0x88, 0x73, 0xbf, 0x85,
+	0xb4, 0x26, 0x27, 0x50, 0xd3, 0x14, 0xd2, 0xe2, 0x43, 0x59, 0xa4, 0xbb, 0xdf, 0x11, 0x58, 0x7d,
+	0xaa, 0xce, 0xe8, 0xc3, 0x3f, 0x22, 0x5f, 0x5e, 0x7a, 0x36, 0xfe, 0xe9, 0xd2, 0x67, 0xc4, 0xde,
+	0xc8, 0xc5, 0x8e, 0x9f, 0x01, 0x44, 0x42, 0x0d, 0x58, 0x34, 0xf0, 0x39, 0xcf, 0xb5, 0x65, 0x46,
+	0x42, 0x9d, 0x44, 0x87, 0x9c, 0xe3, 0x3d, 0x68, 0xe5, 0xd1, 0x84, 0x0e, 0xa5, 0xd5, 0x70, 0x0c,
+	0xaf, 0x4d, 0x9a, 0x3a, 0x4c, 0xe8, 0x50, 0xba, 0x04, 0x76, 0x2b, 0xf8, 0xd7, 0x1b, 0xca, 0xad,
+	0x9e, 0xc9, 0x21, 0xe7, 0xff, 0x7f, 0x26, 0x39, 0xff, 0x79, 0xac, 0x5a, 0xfc, 0x7b, 0x3f, 0x0c,
+	0x68, 0xa5, 0xb2, 0xbe, 0xa4, 0xc9, 0x3d, 0xbb, 0xa2, 0xb8, 0x0f, 0xeb, 0xf9, 0x6b, 0x80, 0xb7,
+	0xe7, 0x1e, 0xa9, 0xbc, 0x2d, 0x7b, 0x67, 0xc1, 0x9f, 0x51, 0x70, 0x9b, 0xbf, 0xbf, 0x79, 0x0d,
+	0x73, 0xc5, 0x46, 0xaf, 0x0f, 0x10, 0x7e, 0x0f, 0x66, 0xf1, 0xac, 0xe0, 0x9d, 0x25, 0xcf, 0x9d,
+	0x6d, 0x2d, 0x06, 0xaa, 0x6a, 0x7d, 0xd6, 0x7f, 0x92, 0x52, 0xd7, 0xf8, 0x79, 0x29, 0x71, 0x71,
+	0xf2, 0xf6, 0xde, 0xb2, 0x70, 0x55, 0x75, 0x0a, 0x8f, 0x17, 0x64, 0x81, 0x9d, 0x52, 0x85, 0x4a,
+	0xc5, 0xdb, 0xfb, 0x7f, 0xb9, 0xb1, 0x1c, 0x66, 0x76, 0x7b, 0x33, 0x30, 0x95, 0x22, 0x9a, 0x81,
+	0xa9, 0x5e, 0xfd, 0x0c, 0xcc, 0xd1, 0xc1, 0xa7, 0x34, 0x81, 0xfb, 0x41, 0xe7, 0x4a, 0x8c, 0xba,
+	0x99, 0xf9, 0x4a, 0x24, 0xd7, 0xdd, 0xac, 0x4c, 0x57, 0xff, 0x9b, 0xbb, 0xd7, 0x22, 0x3f, 0xc7,
+	0x41, 0xb0, 0xa6, 0x5d, 0x6f, 0xfe, 0x04, 0x00, 0x00, 0xff, 0xff, 0x4b, 0xcb, 0x42, 0x4d, 0xd2,
+	0x07, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/ruby/proto/gitaly/blob_pb.rb b/ruby/proto/gitaly/blob_pb.rb
index 2e29cedab..eab74286c 100644
--- a/ruby/proto/gitaly/blob_pb.rb
+++ b/ruby/proto/gitaly/blob_pb.rb
@@ -32,6 +32,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :mode, :int32, 5
     optional :revision, :string, 6
     optional :path, :bytes, 7
+    optional :type, :enum, 8, "gitaly.ObjectType"
   end
   add_message "gitaly.LFSPointer" do
     optional :size, :int64, 1