Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2020-01-23 16:38:54 +0300
committerJacob Vosmaer <jacob@gitlab.com>2020-01-23 16:38:54 +0300
commit6b023d8bd90402c1c887b8f1c71f3c9e99542cac (patch)
tree34a3ba0ef017dfa543f66470ffbaee0aecf4fdb2
parent18006a8976bc642f1d057be8526e05a3a2ed3a5c (diff)
parentc784ab945f8a8be6f6120432019e8a6cd7420a62 (diff)
Merge branch 'po-getalllfspointers-remove-rev' into 'master'
Remove revision from GetAllLFSPointers request Closes #2247 See merge request gitlab-org/gitaly!1771
-rw-r--r--changelogs/unreleased/po-getalllfspointers-remove-rev.yml5
-rw-r--r--internal/service/blob/lfs_pointers.go4
-rw-r--r--internal/service/blob/lfs_pointers_test.go64
-rw-r--r--proto/blob.proto4
-rw-r--r--proto/go/gitalypb/blob.pb.go104
-rw-r--r--ruby/lib/gitaly_server/blob_service.rb4
-rw-r--r--ruby/proto/gitaly/blob_pb.rb1
7 files changed, 105 insertions, 81 deletions
diff --git a/changelogs/unreleased/po-getalllfspointers-remove-rev.yml b/changelogs/unreleased/po-getalllfspointers-remove-rev.yml
new file mode 100644
index 000000000..86002def9
--- /dev/null
+++ b/changelogs/unreleased/po-getalllfspointers-remove-rev.yml
@@ -0,0 +1,5 @@
+---
+title: Remove revision from GetAllLFSPointers request
+merge_request: 1771
+author:
+type: other
diff --git a/internal/service/blob/lfs_pointers.go b/internal/service/blob/lfs_pointers.go
index 4dfbd27ab..9fffdb7a3 100644
--- a/internal/service/blob/lfs_pointers.go
+++ b/internal/service/blob/lfs_pointers.go
@@ -108,8 +108,8 @@ func (s *server) GetNewLFSPointers(in *gitalypb.GetNewLFSPointersRequest, stream
func (s *server) GetAllLFSPointers(in *gitalypb.GetAllLFSPointersRequest, stream gitalypb.BlobService_GetAllLFSPointersServer) error {
ctx := stream.Context()
- if err := validateGetLfsPointersByRevisionRequest(in); err != nil {
- return helper.ErrInvalidArgument(err)
+ if in.GetRepository() == nil {
+ return helper.ErrInvalidArgument(fmt.Errorf("empty Repository"))
}
client, err := s.ruby.BlobServiceClient(ctx)
diff --git a/internal/service/blob/lfs_pointers_test.go b/internal/service/blob/lfs_pointers_test.go
index 5f40baa07..019caa37c 100644
--- a/internal/service/blob/lfs_pointers_test.go
+++ b/internal/service/blob/lfs_pointers_test.go
@@ -3,6 +3,7 @@ package blob
import (
"io"
"os/exec"
+ "strings"
"testing"
"github.com/stretchr/testify/require"
@@ -365,7 +366,6 @@ func TestSuccessfulGetAllLFSPointersRequest(t *testing.T) {
request := &gitalypb.GetAllLFSPointersRequest{
Repository: testRepo,
- Revision: []byte("54fcc214b94e78d7a41a9a8fe6d87a5e59500e51"),
}
expectedLFSPointers := []*gitalypb.LFSPointer{
@@ -429,31 +429,16 @@ func TestFailedGetAllLFSPointersRequestDueToValidations(t *testing.T) {
client, conn := newBlobClient(t, serverSocketPath)
defer conn.Close()
- testRepo, _, cleanupFn := testhelper.NewTestRepo(t)
- defer cleanupFn()
-
ctx, cancel := testhelper.Context()
defer cancel()
testCases := []struct {
desc string
repository *gitalypb.Repository
- revision []byte
}{
{
desc: "empty Repository",
repository: nil,
- revision: []byte("master"),
- },
- {
- desc: "empty revision",
- repository: testRepo,
- revision: nil,
- },
- {
- desc: "revision can't start with '-'",
- repository: testRepo,
- revision: []byte("-suspicious-revision"),
},
}
@@ -461,7 +446,6 @@ func TestFailedGetAllLFSPointersRequestDueToValidations(t *testing.T) {
t.Run(tc.desc, func(t *testing.T) {
request := &gitalypb.GetAllLFSPointersRequest{
Repository: tc.repository,
- Revision: tc.revision,
}
c, err := client.GetAllLFSPointers(ctx, request)
@@ -482,3 +466,49 @@ func drainAllPointers(c gitalypb.BlobService_GetAllLFSPointersClient) error {
}
}
}
+
+// TestGetAllLFSPointersVerifyScope verifies that this RPC returns all LFS
+// pointers in a repository, not only ones reachable from the default branch
+func TestGetAllLFSPointersVerifyScope(t *testing.T) {
+ server, serverSocketPath := runBlobServer(t)
+ defer server.Stop()
+
+ client, conn := newBlobClient(t, serverSocketPath)
+ defer conn.Close()
+
+ testRepo, repoPath, cleanupFn := testhelper.NewTestRepo(t)
+ defer cleanupFn()
+
+ ctx, cancel := testhelper.Context()
+ defer cancel()
+
+ request := &gitalypb.GetAllLFSPointersRequest{
+ Repository: testRepo,
+ }
+
+ c, err := client.GetAllLFSPointers(ctx, request)
+ require.NoError(t, err)
+
+ lfsPtr := &gitalypb.LFSPointer{
+ Size: 127,
+ Data: []byte("version https://git-lfs.github.com/spec/v1\noid sha256:f2b0a1e7550e9b718dafc9b525a04879a766de62e4fbdfc46593d47f7ab74636\nsize 20\n"),
+ Oid: "f78df813119a79bfbe0442ab92540a61d3ab7ff3",
+ }
+
+ // the LFS pointer is reachable from a non-default branch:
+ require.True(t, refHasPtr(t, repoPath, "moar-lfs-ptrs", lfsPtr))
+
+ // the same pointer is not reachable from a default branch
+ require.False(t, refHasPtr(t, repoPath, "master", lfsPtr))
+
+ require.Contains(t, getAllPointers(t, c), lfsPtr,
+ "RPC should return all LFS pointers, not just ones in the default branch")
+}
+
+// refHasPtr verifies the provided ref has connectivity to the LFS pointer
+func refHasPtr(t *testing.T, repoPath, ref string, lfsPtr *gitalypb.LFSPointer) bool {
+ objects := string(testhelper.MustRunCommand(t, nil,
+ "git", "-C", repoPath, "rev-list", "--objects", ref))
+
+ return strings.Contains(objects, lfsPtr.Oid)
+}
diff --git a/proto/blob.proto b/proto/blob.proto
index 0696ae541..6497556d8 100644
--- a/proto/blob.proto
+++ b/proto/blob.proto
@@ -126,9 +126,7 @@ message GetNewLFSPointersResponse {
message GetAllLFSPointersRequest {
Repository repository = 1;
- // This revision field is ignored by the implementation; it should be
- // removed! https://gitlab.com/gitlab-org/gitaly/issues/2247
- bytes revision = 2;
+ reserved 2;
}
message GetAllLFSPointersResponse {
diff --git a/proto/go/gitalypb/blob.pb.go b/proto/go/gitalypb/blob.pb.go
index cd6252ce9..b7542a769 100644
--- a/proto/go/gitalypb/blob.pb.go
+++ b/proto/go/gitalypb/blob.pb.go
@@ -649,13 +649,10 @@ func (m *GetNewLFSPointersResponse) GetLfsPointers() []*LFSPointer {
}
type GetAllLFSPointersRequest struct {
- Repository *Repository `protobuf:"bytes,1,opt,name=repository,proto3" json:"repository,omitempty"`
- // This revision field is ignored by the implementation; it should be
- // removed! https://gitlab.com/gitlab-org/gitaly/issues/2247
- Revision []byte `protobuf:"bytes,2,opt,name=revision,proto3" json:"revision,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
+ Repository *Repository `protobuf:"bytes,1,opt,name=repository,proto3" json:"repository,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_unrecognized []byte `json:"-"`
+ XXX_sizecache int32 `json:"-"`
}
func (m *GetAllLFSPointersRequest) Reset() { *m = GetAllLFSPointersRequest{} }
@@ -690,13 +687,6 @@ func (m *GetAllLFSPointersRequest) GetRepository() *Repository {
return nil
}
-func (m *GetAllLFSPointersRequest) GetRevision() []byte {
- if m != nil {
- return m.Revision
- }
- return nil
-}
-
type GetAllLFSPointersResponse struct {
LfsPointers []*LFSPointer `protobuf:"bytes,1,rep,name=lfs_pointers,json=lfsPointers,proto3" json:"lfs_pointers,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -755,49 +745,49 @@ func init() {
func init() { proto.RegisterFile("blob.proto", fileDescriptor_6903d1e8a20272e8) }
var fileDescriptor_6903d1e8a20272e8 = []byte{
- // 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,
+ // 665 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xc1, 0x4e, 0xdb, 0x4c,
+ 0x10, 0xd6, 0xc6, 0x09, 0x38, 0x93, 0xc0, 0xcf, 0xbf, 0x6a, 0xc1, 0x58, 0x2d, 0x32, 0x56, 0x55,
+ 0xf9, 0xd2, 0x84, 0xa6, 0xea, 0xb5, 0x12, 0x1c, 0x88, 0x80, 0x0a, 0xd0, 0xc2, 0xa9, 0xaa, 0x14,
+ 0xd9, 0x78, 0x03, 0x5b, 0x6d, 0xbc, 0xae, 0x77, 0x01, 0xa5, 0x2f, 0xd2, 0xb7, 0xe9, 0x23, 0xf4,
+ 0x05, 0xfa, 0x02, 0x7d, 0x86, 0x9e, 0x2a, 0xaf, 0xed, 0xc4, 0x49, 0x9c, 0x5e, 0xc2, 0x6d, 0x76,
+ 0x66, 0x67, 0xbe, 0x6f, 0x66, 0x3e, 0xaf, 0x01, 0x02, 0x2e, 0x82, 0x4e, 0x9c, 0x08, 0x25, 0xf0,
+ 0xda, 0x2d, 0x53, 0x3e, 0x1f, 0xdb, 0x6d, 0x79, 0xe7, 0x27, 0x34, 0xcc, 0xbc, 0x2e, 0x87, 0xcd,
+ 0x3e, 0x55, 0x47, 0x5c, 0x04, 0x84, 0x7e, 0xbd, 0xa7, 0x52, 0xe1, 0x1e, 0x40, 0x42, 0x63, 0x21,
+ 0x99, 0x12, 0xc9, 0xd8, 0x42, 0x0e, 0xf2, 0x5a, 0x3d, 0xdc, 0xc9, 0x92, 0x3b, 0x64, 0x12, 0x21,
+ 0xa5, 0x5b, 0x78, 0x0b, 0x0c, 0xc1, 0x42, 0xab, 0xe6, 0x20, 0xaf, 0x49, 0x52, 0x13, 0x3f, 0x83,
+ 0x06, 0x67, 0x23, 0xa6, 0x2c, 0xc3, 0x41, 0x9e, 0x41, 0xb2, 0x83, 0x7b, 0x06, 0xff, 0x4d, 0xd0,
+ 0x64, 0x2c, 0x22, 0x49, 0x31, 0x86, 0xba, 0x64, 0xdf, 0xa8, 0x06, 0x32, 0x88, 0xb6, 0x53, 0x5f,
+ 0xe8, 0x2b, 0x5f, 0xd7, 0x6b, 0x13, 0x6d, 0x17, 0x10, 0xc6, 0x04, 0xc2, 0xfd, 0x8d, 0x26, 0xd5,
+ 0xe4, 0x2a, 0xe4, 0xcf, 0x60, 0x33, 0xa1, 0x0f, 0x4c, 0x32, 0x11, 0x0d, 0x62, 0x5f, 0xdd, 0x49,
+ 0xab, 0xe6, 0x18, 0x5e, 0xab, 0xf7, 0xaa, 0xc8, 0x9b, 0x03, 0xe9, 0x90, 0xfc, 0xf6, 0xa5, 0xaf,
+ 0xee, 0xc8, 0x46, 0x52, 0x3a, 0xc9, 0xea, 0xbe, 0xed, 0x0f, 0xd0, 0x2e, 0x27, 0x61, 0x1b, 0xcc,
+ 0x22, 0x4d, 0x93, 0x6c, 0x92, 0xc9, 0x39, 0x6d, 0x3e, 0x65, 0x51, 0x34, 0x9f, 0xda, 0xee, 0x2f,
+ 0x04, 0x5b, 0x53, 0x16, 0xab, 0x4e, 0x0e, 0xef, 0x43, 0x9b, 0xc9, 0x81, 0xbc, 0x0f, 0x46, 0x22,
+ 0xbc, 0xe7, 0xd4, 0xaa, 0x3b, 0xc8, 0x33, 0x49, 0x8b, 0xc9, 0xab, 0xc2, 0x95, 0x16, 0x1a, 0x89,
+ 0x90, 0x5a, 0x0d, 0x07, 0x79, 0x0d, 0xa2, 0xed, 0x19, 0xd6, 0x6b, 0x4b, 0x58, 0xaf, 0x4f, 0x59,
+ 0xe3, 0xd7, 0x50, 0x57, 0xe3, 0x98, 0x5a, 0xa6, 0x83, 0xbc, 0xcd, 0xe9, 0x1a, 0x2e, 0x82, 0x2f,
+ 0xf4, 0x46, 0x5d, 0x8f, 0x63, 0x4a, 0x74, 0xdc, 0x3d, 0x06, 0xf8, 0x78, 0x7c, 0x75, 0x29, 0x58,
+ 0xa4, 0x68, 0xb2, 0x82, 0x20, 0x4e, 0x60, 0xe3, 0x9c, 0x3e, 0xa6, 0x43, 0xca, 0x20, 0x2a, 0x4b,
+ 0x2d, 0x4a, 0xb5, 0xa0, 0x6e, 0x94, 0x06, 0x3e, 0x84, 0xe7, 0x7d, 0xaa, 0xa6, 0xac, 0x56, 0x12,
+ 0xd8, 0x2e, 0x98, 0xe9, 0x77, 0x38, 0x60, 0x61, 0x26, 0xad, 0x26, 0x59, 0x4f, 0xcf, 0x27, 0xa1,
+ 0x74, 0x2f, 0x60, 0x7b, 0x1e, 0x27, 0xdf, 0xee, 0x7b, 0x68, 0xf3, 0xa1, 0x1c, 0xc4, 0xb9, 0xdf,
+ 0x42, 0x5a, 0x93, 0x13, 0xa8, 0x69, 0x0a, 0x69, 0xf1, 0xa1, 0x2c, 0xd2, 0xdd, 0x1f, 0x08, 0xac,
+ 0x3e, 0x55, 0xe7, 0xf4, 0xf1, 0x89, 0xc8, 0x97, 0x97, 0x9e, 0x8d, 0x7f, 0xba, 0xf4, 0x19, 0xb1,
+ 0x37, 0x72, 0xb1, 0xe3, 0x17, 0x00, 0x91, 0x50, 0x03, 0x16, 0x0d, 0x7c, 0xce, 0x73, 0x6d, 0x99,
+ 0x91, 0x50, 0x27, 0xd1, 0x21, 0xe7, 0x78, 0x0f, 0x5a, 0x79, 0x34, 0xa1, 0x43, 0x69, 0x35, 0x1c,
+ 0xc3, 0x6b, 0x93, 0xa6, 0x0e, 0x13, 0x3a, 0x94, 0x2e, 0x81, 0xdd, 0x0a, 0xfe, 0xab, 0x0d, 0xe5,
+ 0x5a, 0xcf, 0xe4, 0x90, 0xf3, 0xa7, 0x99, 0xc9, 0x69, 0xdd, 0xac, 0x6d, 0x19, 0x39, 0xd3, 0xf9,
+ 0xaa, 0x2b, 0x31, 0xed, 0xfd, 0x34, 0xa0, 0x95, 0x0a, 0xf8, 0x8a, 0x26, 0x0f, 0xec, 0x86, 0xe2,
+ 0x3e, 0xac, 0xe7, 0xdf, 0x3d, 0xde, 0x9e, 0x7b, 0x8e, 0xf2, 0x06, 0xec, 0x9d, 0x05, 0x7f, 0x46,
+ 0xc1, 0x6d, 0xfe, 0xf9, 0xee, 0x35, 0xcc, 0x9a, 0x8d, 0xde, 0x1e, 0x20, 0x7c, 0x0a, 0x66, 0xf1,
+ 0x80, 0xe0, 0x9d, 0x25, 0x0f, 0x9b, 0x6d, 0x2d, 0x06, 0xaa, 0x6a, 0x7d, 0xd6, 0xff, 0x8c, 0x52,
+ 0xd7, 0xf8, 0x65, 0x29, 0x71, 0x71, 0xc6, 0xf6, 0xde, 0xb2, 0x70, 0x55, 0x75, 0x0a, 0xff, 0x2f,
+ 0x08, 0x00, 0x3b, 0xa5, 0x0a, 0x95, 0xda, 0xb6, 0xf7, 0xff, 0x71, 0x63, 0x39, 0xcc, 0xec, 0xf6,
+ 0x66, 0x60, 0x2a, 0xe5, 0x32, 0x03, 0x53, 0xbd, 0xfa, 0x19, 0x98, 0xa3, 0x83, 0x4f, 0x69, 0x02,
+ 0xf7, 0x83, 0xce, 0x8d, 0x18, 0x75, 0x33, 0xf3, 0x8d, 0x48, 0x6e, 0xbb, 0x59, 0x99, 0xae, 0xfe,
+ 0x0b, 0x77, 0x6f, 0x45, 0x7e, 0x8e, 0x83, 0x60, 0x4d, 0xbb, 0xde, 0xfd, 0x0d, 0x00, 0x00, 0xff,
+ 0xff, 0x9f, 0x79, 0x8a, 0x35, 0xbc, 0x07, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
diff --git a/ruby/lib/gitaly_server/blob_service.rb b/ruby/lib/gitaly_server/blob_service.rb
index 4e14e882e..32fcbbabd 100644
--- a/ruby/lib/gitaly_server/blob_service.rb
+++ b/ruby/lib/gitaly_server/blob_service.rb
@@ -32,7 +32,9 @@ module GitalyServer
def get_all_lfs_pointers(request, call)
Enumerator.new do |y|
- changes = lfs_changes(request, call)
+ repo = Gitlab::Git::Repository.from_gitaly(request.repository, call)
+
+ changes = Gitlab::Git::LfsChanges.new(repo, "")
sliced_gitaly_lfs_pointers(changes.all_pointers) do |lfs_pointers|
y.yield Gitaly::GetAllLFSPointersResponse.new(lfs_pointers: lfs_pointers)
diff --git a/ruby/proto/gitaly/blob_pb.rb b/ruby/proto/gitaly/blob_pb.rb
index eab74286c..e1d3b1f6c 100644
--- a/ruby/proto/gitaly/blob_pb.rb
+++ b/ruby/proto/gitaly/blob_pb.rb
@@ -63,7 +63,6 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
end
add_message "gitaly.GetAllLFSPointersRequest" do
optional :repository, :message, 1, "gitaly.Repository"
- optional :revision, :bytes, 2
end
add_message "gitaly.GetAllLFSPointersResponse" do
repeated :lfs_pointers, :message, 1, "gitaly.LFSPointer"