Merge branch 'pks-blob-lfs-interface-revamp' into 'master'

blob: Revamp interface for LFS pointers

See merge request gitlab-org/gitaly!3316

10 files changed, 1000 insertions, 44 deletions

diff --git a/changelogs/unreleased/pks-blob-lfs-interface-revamp.yml b/changelogs/unreleased/pks-blob-lfs-interface-revamp.yml
new file mode 100644
index 000000000..70a8a8cc9
--- /dev/null
+++ b/changelogs/unreleased/pks-blob-lfs-interface-revamp.yml
@@ -0,0 +1,5 @@
+---
+title: 'blob: Revamp interface for LFS pointers'
+merge_request: 3316
+author:
+type: added
diff --git a/go.mod b/go.mod
index 9b67ddc36..cf93bb0fe 100644
--- a/go.mod
+++ b/go.mod
@@ -44,6 +44,7 @@ require (
 	golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5 // indirect
 	golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
 	golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4
+	golang.org/x/text v0.3.3
 	google.golang.org/grpc v1.29.1
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
diff --git a/internal/gitaly/service/blob/lfs_pointer_filter.go b/internal/gitaly/service/blob/lfs_pointer_filter.go
new file mode 100644
index 000000000..3f211ab26
--- /dev/null
+++ b/internal/gitaly/service/blob/lfs_pointer_filter.go
@@ -0,0 +1,60 @@
+package blob
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"strconv"
+
+	"golang.org/x/text/transform"
+)
+
+// lfsPointerFilter transforms and filters the output of `git cat-file --batch-check='%(objecttype)
+// %(objectsize) %(objectname)' into a list of LFS pointer candidates. It strips all objects which
+// are not blobs or whose size is too big for an LFS pointer.
+type lfsPointerFilter struct{}
+
+func (t lfsPointerFilter) Transform(dst, src []byte, atEOF bool) (int, int, error) {
+	origDst, origSrc := dst, src
+
+	for {
+		if len(src) == 0 && atEOF {
+			return 0, 0, nil
+		}
+
+		index := bytes.Index(src, []byte{'\n'})
+		if index < 0 {
+			if atEOF {
+				return 0, 0, errors.New("invalid trailing LFS pointer line")
+			}
+			return len(origDst) - len(dst), len(origSrc) - len(src), transform.ErrShortSrc
+		}
+
+		objectInfo := bytes.SplitN(src[:index], []byte{' '}, 3)
+		if len(objectInfo) != 3 {
+			return 0, 0, fmt.Errorf("invalid LFS pointer candidate line %q", string(src[:index]))
+		}
+		objectSize, err := strconv.Atoi(string(objectInfo[1]))
+		if err != nil {
+			return 0, 0, fmt.Errorf("invalid LFS pointer size %q", string(objectInfo[1]))
+		}
+
+		if objectSize > lfsPointerMaxSize || !bytes.Equal(objectInfo[0], []byte("blob")) {
+			src = src[index+1:]
+			continue
+		}
+
+		oid := objectInfo[2]
+		if len(dst) < len(oid)+1 {
+			return len(origDst) - len(dst), len(origSrc) - len(src), transform.ErrShortDst
+		}
+
+		copy(dst, oid)
+		dst[len(oid)] = '\n'
+
+		src = src[index+1:]
+		dst = dst[len(oid)+1:]
+	}
+}
+
+func (t lfsPointerFilter) Reset() {}
diff --git a/internal/gitaly/service/blob/lfs_pointer_filter_test.go b/internal/gitaly/service/blob/lfs_pointer_filter_test.go
new file mode 100644
index 000000000..9114a4601
--- /dev/null
+++ b/internal/gitaly/service/blob/lfs_pointer_filter_test.go
@@ -0,0 +1,126 @@
+package blob
+
+import (
+	"bytes"
+	"errors"
+	"io/ioutil"
+	"strconv"
+	"strings"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	"gitlab.com/gitlab-org/gitaly/internal/git"
+	"gitlab.com/gitlab-org/gitaly/internal/git/localrepo"
+	"gitlab.com/gitlab-org/gitaly/internal/testhelper"
+	"golang.org/x/text/transform"
+)
+
+func TestLFSPointerFilter(t *testing.T) {
+	cfg, repo, _, _ := setup(t)
+	gitCmdFactory := git.NewExecCommandFactory(cfg)
+	localRepo := localrepo.New(gitCmdFactory, repo, cfg)
+
+	ctx, cancel := testhelper.Context()
+	defer cancel()
+
+	var batchCheckOutput bytes.Buffer
+	err := localRepo.ExecAndWait(ctx, git.SubCmd{
+		Name: "cat-file",
+		Flags: []git.Option{
+			git.Flag{"--batch-all-objects"},
+			git.Flag{"--batch-check=%(objecttype) %(objectsize) %(objectname)"},
+		},
+	}, git.WithStdout(&batchCheckOutput))
+	require.NoError(t, err)
+
+	// We're manually reimplementing filtering of objects here. While this may seem hacky, it
+	// asserts that we can parse largish output directly produced by the command. Also, given
+	// that the system under test is implemented completely different, it cross-checks both
+	// implementations against each other.
+	var expectedOIDs []string
+	for _, line := range strings.Split(batchCheckOutput.String(), "\n") {
+		if len(line) == 0 {
+			continue
+		}
+		objectInfo := strings.SplitN(line, " ", 3)
+		require.Len(t, objectInfo, 3)
+		objectSize, err := strconv.Atoi(objectInfo[1])
+		require.NoError(t, err)
+
+		if objectInfo[0] == "blob" && objectSize <= lfsPointerMaxSize {
+			expectedOIDs = append(expectedOIDs, objectInfo[2])
+		}
+	}
+	require.Greater(t, len(expectedOIDs), 100)
+
+	for _, tc := range []struct {
+		desc           string
+		input          string
+		expectedOutput string
+		expectedErr    error
+	}{
+		{
+			desc:           "empty",
+			input:          "",
+			expectedOutput: "",
+		},
+		{
+			desc:        "newline only",
+			input:       "\n",
+			expectedErr: errors.New("invalid LFS pointer candidate line \"\""),
+		},
+		{
+			desc:        "invalid LFS pointer",
+			input:       "x",
+			expectedErr: errors.New("invalid trailing LFS pointer line"),
+		},
+		{
+			desc:           "single blob",
+			input:          "blob 140 1234\n",
+			expectedOutput: "1234\n",
+		},
+		{
+			desc:           "multiple blobs",
+			input:          "blob 140 1234\nblob 150 4321\n",
+			expectedOutput: "1234\n4321\n",
+		},
+		{
+			desc:           "mixed blobs and other objects",
+			input:          "blob 140 1234\ntree 150 4321\ncommit 50123 123123\n",
+			expectedOutput: "1234\n",
+		},
+		{
+			desc:           "big blob gets filtered",
+			input:          "blob 140 1234\nblob 201 4321\n",
+			expectedOutput: "1234\n",
+		},
+		{
+			desc:        "missing trailing newline",
+			input:       "blob 140 1234",
+			expectedErr: errors.New("invalid trailing LFS pointer line"),
+		},
+		{
+			desc:        "invalid object size",
+			input:       "blob 140 1234\nblob x 4321\n",
+			expectedErr: errors.New("invalid LFS pointer size \"x\""),
+		},
+		{
+			desc:        "missing field",
+			input:       "blob 1234\n",
+			expectedErr: errors.New("invalid LFS pointer candidate line \"blob 1234\""),
+		},
+		{
+			desc:           "real-repo output",
+			input:          batchCheckOutput.String(),
+			expectedOutput: strings.Join(expectedOIDs, "\n") + "\n",
+		},
+	} {
+		t.Run(tc.desc, func(t *testing.T) {
+			reader := transform.NewReader(strings.NewReader(tc.input),
+				lfsPointerFilter{})
+			output, err := ioutil.ReadAll(reader)
+			require.Equal(t, tc.expectedErr, err)
+			require.Equal(t, tc.expectedOutput, string(output))
+		})
+	}
+}
diff --git a/internal/gitaly/service/blob/lfs_pointers.go b/internal/gitaly/service/blob/lfs_pointers.go
index f30594e1b..6e6330f1a 100644
--- a/internal/gitaly/service/blob/lfs_pointers.go
+++ b/internal/gitaly/service/blob/lfs_pointers.go
@@ -16,6 +16,7 @@ import (
 	"gitlab.com/gitlab-org/gitaly/internal/git/localrepo"
 	"gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag"
 	"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
+	"golang.org/x/text/transform"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )
@@ -39,6 +40,78 @@ type getLFSPointerByRevisionRequest interface {
 	GetRevision() []byte
 }
 
+// ListLFSPointers finds all LFS pointers which are transitively reachable via a graph walk of the
+// given set of revisions.
+func (s *server) ListLFSPointers(in *gitalypb.ListLFSPointersRequest, stream gitalypb.BlobService_ListLFSPointersServer) error {
+	ctx := stream.Context()
+
+	if in.GetRepository() == nil {
+		return status.Error(codes.InvalidArgument, "empty repository")
+	}
+	if len(in.Revisions) == 0 {
+		return status.Error(codes.InvalidArgument, "missing revisions")
+	}
+
+	repo := localrepo.New(s.gitCmdFactory, in.Repository, s.cfg)
+	lfsPointers, err := findLFSPointersByRevisions(ctx, repo, s.gitCmdFactory, int(in.Limit), in.Revisions...)
+	if err != nil {
+		if errors.Is(err, errInvalidRevision) {
+			return status.Errorf(codes.InvalidArgument, err.Error())
+		}
+		return err
+	}
+
+	if err := sliceLFSPointers(lfsPointers, func(slice []*gitalypb.LFSPointer) error {
+		return stream.Send(&gitalypb.ListLFSPointersResponse{
+			LfsPointers: slice,
+		})
+	}); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// ListAllLFSPointers finds all LFS pointers which exist in the repository, including those which
+// are not reachable via graph walks.
+func (s *server) ListAllLFSPointers(in *gitalypb.ListAllLFSPointersRequest, stream gitalypb.BlobService_ListAllLFSPointersServer) error {
+	ctx := stream.Context()
+
+	if in.GetRepository() == nil {
+		return status.Error(codes.InvalidArgument, "empty repository")
+	}
+
+	repo := localrepo.New(s.gitCmdFactory, in.Repository, s.cfg)
+	cmd, err := repo.Exec(ctx, git.SubCmd{
+		Name: "cat-file",
+		Flags: []git.Option{
+			git.Flag{Name: "--batch-all-objects"},
+			git.Flag{Name: "--batch-check=%(objecttype) %(objectsize) %(objectname)"},
+			git.Flag{Name: "--buffer"},
+			git.Flag{Name: "--unordered"},
+		},
+	})
+	if err != nil {
+		return status.Errorf(codes.Internal, "could not run batch-check: %v", err)
+	}
+
+	filteredReader := transform.NewReader(cmd, lfsPointerFilter{})
+	lfsPointers, err := readLFSPointers(ctx, repo, filteredReader, int(in.Limit))
+	if err != nil {
+		return status.Errorf(codes.Internal, "could not read LFS pointers: %v", err)
+	}
+
+	if err := sliceLFSPointers(lfsPointers, func(slice []*gitalypb.LFSPointer) error {
+		return stream.Send(&gitalypb.ListAllLFSPointersResponse{
+			LfsPointers: slice,
+		})
+	}); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 // GetLFSPointers takes the list of requested blob IDs and filters them down to blobs which are
 // valid LFS pointers. It is fine to pass blob IDs which do not point to a valid LFS pointer, but
 // passing blob IDs which do not exist results in an error.
diff --git a/internal/gitaly/service/blob/lfs_pointers_test.go b/internal/gitaly/service/blob/lfs_pointers_test.go
index c51c214b3..18d22b4db 100644
--- a/internal/gitaly/service/blob/lfs_pointers_test.go
+++ b/internal/gitaly/service/blob/lfs_pointers_test.go
@@ -6,7 +6,9 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"os"
 	"os/exec"
+	"path/filepath"
 	"strings"
 	"testing"
 
@@ -14,11 +16,13 @@ import (
 	"gitlab.com/gitlab-org/gitaly/internal/git"
 	"gitlab.com/gitlab-org/gitaly/internal/git/gittest"
 	"gitlab.com/gitlab-org/gitaly/internal/git/localrepo"
+	"gitlab.com/gitlab-org/gitaly/internal/helper/text"
 	"gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag"
 	"gitlab.com/gitlab-org/gitaly/internal/testhelper"
 	"gitlab.com/gitlab-org/gitaly/internal/testhelper/testcfg"
 	"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 )
 
 const (
@@ -65,6 +69,229 @@ var (
 	}
 )
 
+func TestListLFSPointers(t *testing.T) {
+	_, repo, _, client := setup(t)
+
+	ctx, cancel := testhelper.Context()
+	defer cancel()
+
+	for _, tc := range []struct {
+		desc             string
+		revs             []string
+		limit            int32
+		expectedPointers []*gitalypb.LFSPointer
+		expectedErr      error
+	}{
+		{
+			desc:        "missing revisions",
+			revs:        []string{},
+			expectedErr: status.Error(codes.InvalidArgument, "missing revisions"),
+		},
+		{
+			desc:        "invalid revision",
+			revs:        []string{"-dashed"},
+			expectedErr: status.Error(codes.InvalidArgument, "invalid revision: \"-dashed\""),
+		},
+		{
+			desc: "object IDs",
+			revs: []string{
+				lfsPointer1,
+				lfsPointer2,
+				lfsPointer3,
+				"d5b560e9c17384cf8257347db63167b54e0c97ff", // tree
+				"60ecb67744cb56576c30214ff52294f8ce2def98", // commit
+			},
+			expectedPointers: []*gitalypb.LFSPointer{
+				lfsPointers[lfsPointer1],
+				lfsPointers[lfsPointer2],
+				lfsPointers[lfsPointer3],
+			},
+		},
+		{
+			desc: "revision",
+			revs: []string{"refs/heads/master"},
+			expectedPointers: []*gitalypb.LFSPointer{
+				lfsPointers[lfsPointer1],
+			},
+		},
+		{
+			desc: "pseudo-revisions",
+			revs: []string{"refs/heads/master", "--not", "--all"},
+		},
+		{
+			desc: "partial graph walk",
+			revs: []string{"--all", "--not", "refs/heads/master"},
+			expectedPointers: []*gitalypb.LFSPointer{
+				lfsPointers[lfsPointer2],
+				lfsPointers[lfsPointer3],
+				lfsPointers[lfsPointer4],
+				lfsPointers[lfsPointer5],
+				lfsPointers[lfsPointer6],
+			},
+		},
+		{
+			desc:  "partial graph walk with matching limit",
+			revs:  []string{"--all", "--not", "refs/heads/master"},
+			limit: 5,
+			expectedPointers: []*gitalypb.LFSPointer{
+				lfsPointers[lfsPointer2],
+				lfsPointers[lfsPointer3],
+				lfsPointers[lfsPointer4],
+				lfsPointers[lfsPointer5],
+				lfsPointers[lfsPointer6],
+			},
+		},
+		{
+			desc:  "partial graph walk with limiting limit",
+			revs:  []string{"--all", "--not", "refs/heads/master"},
+			limit: 3,
+			expectedPointers: []*gitalypb.LFSPointer{
+				lfsPointers[lfsPointer4],
+				lfsPointers[lfsPointer5],
+				lfsPointers[lfsPointer6],
+			},
+		},
+	} {
+		t.Run(tc.desc, func(t *testing.T) {
+			stream, err := client.ListLFSPointers(ctx, &gitalypb.ListLFSPointersRequest{
+				Repository: repo,
+				Revisions:  tc.revs,
+				Limit:      tc.limit,
+			})
+			require.NoError(t, err)
+
+			var actualLFSPointers []*gitalypb.LFSPointer
+			for {
+				resp, err := stream.Recv()
+				if err == io.EOF {
+					break
+				}
+				require.Equal(t, err, tc.expectedErr)
+				if err != nil {
+					break
+				}
+
+				actualLFSPointers = append(actualLFSPointers, resp.GetLfsPointers()...)
+			}
+			require.ElementsMatch(t, tc.expectedPointers, actualLFSPointers)
+		})
+	}
+}
+
+func TestListAllLFSPointers(t *testing.T) {
+	receivePointers := func(t *testing.T, stream gitalypb.BlobService_ListAllLFSPointersClient) []*gitalypb.LFSPointer {
+		t.Helper()
+
+		var pointers []*gitalypb.LFSPointer
+		for {
+			resp, err := stream.Recv()
+			if err == io.EOF {
+				break
+			}
+			require.Nil(t, err)
+			pointers = append(pointers, resp.GetLfsPointers()...)
+		}
+		return pointers
+	}
+
+	ctx, cancel := testhelper.Context()
+	defer cancel()
+
+	lfsPointerContents := `version https://git-lfs.github.com/spec/v1
+oid sha256:1111111111111111111111111111111111111111111111111111111111111111
+size 12345`
+
+	t.Run("normal repository", func(t *testing.T) {
+		_, repo, _, client := setup(t)
+		stream, err := client.ListAllLFSPointers(ctx, &gitalypb.ListAllLFSPointersRequest{
+			Repository: repo,
+		})
+		require.NoError(t, err)
+		require.ElementsMatch(t, []*gitalypb.LFSPointer{
+			lfsPointers[lfsPointer1],
+			lfsPointers[lfsPointer2],
+			lfsPointers[lfsPointer3],
+			lfsPointers[lfsPointer4],
+			lfsPointers[lfsPointer5],
+			lfsPointers[lfsPointer6],
+		}, receivePointers(t, stream))
+	})
+
+	t.Run("dangling LFS pointer", func(t *testing.T) {
+		_, repo, repoPath, client := setup(t)
+
+		lfsPointerOID := text.ChompBytes(testhelper.MustRunCommand(t, strings.NewReader(lfsPointerContents),
+			"git", "-C", repoPath, "hash-object", "-w", "--stdin"))
+
+		stream, err := client.ListAllLFSPointers(ctx, &gitalypb.ListAllLFSPointersRequest{
+			Repository: repo,
+		})
+		require.NoError(t, err)
+		require.ElementsMatch(t, []*gitalypb.LFSPointer{
+			&gitalypb.LFSPointer{
+				Oid:  lfsPointerOID,
+				Data: []byte(lfsPointerContents),
+				Size: int64(len(lfsPointerContents)),
+			},
+			lfsPointers[lfsPointer1],
+			lfsPointers[lfsPointer2],
+			lfsPointers[lfsPointer3],
+			lfsPointers[lfsPointer4],
+			lfsPointers[lfsPointer5],
+			lfsPointers[lfsPointer6],
+		}, receivePointers(t, stream))
+	})
+
+	t.Run("quarantine", func(t *testing.T) {
+		cfg, repoProto, repoPath, client := setup(t)
+
+		// We're emulating the case where git is receiving data via a push, where objects
+		// are stored in a separate quarantine environment. In this case, LFS pointer checks
+		// may want to inspect all newly pushed objects, denoted by a repository proto
+		// message which only has its object directory set to the quarantine directory.
+		quarantineDir := "objects/incoming-123456"
+		require.NoError(t, os.Mkdir(filepath.Join(repoPath, quarantineDir), 0777))
+		repoProto.GitObjectDirectory = quarantineDir
+		repoProto.GitAlternateObjectDirectories = nil
+
+		// There are no quarantined objects yet, so none should be returned here.
+		stream, err := client.ListAllLFSPointers(ctx, &gitalypb.ListAllLFSPointersRequest{
+			Repository: repoProto,
+		})
+		require.NoError(t, err)
+		require.Empty(t, receivePointers(t, stream))
+
+		// Write a new object into the repository. Because we set GIT_OBJECT_DIRECTORY to
+		// the quarantine directory, objects will be written in there instead of into the
+		// repository's normal object directory.
+		repo := localrepo.New(git.NewExecCommandFactory(cfg), repoProto, cfg)
+		var buffer, stderr bytes.Buffer
+		err = repo.ExecAndWait(ctx, git.SubCmd{
+			Name: "hash-object",
+			Flags: []git.Option{
+				git.Flag{Name: "-w"},
+				git.Flag{Name: "--stdin"},
+			},
+		}, git.WithStdin(strings.NewReader(lfsPointerContents)), git.WithStdout(&buffer), git.WithStderr(&stderr))
+		require.NoError(t, err)
+
+		stream, err = client.ListAllLFSPointers(ctx, &gitalypb.ListAllLFSPointersRequest{
+			Repository: repoProto,
+		})
+		require.NoError(t, err)
+
+		// We only expect to find a single LFS pointer, which is the one we've just written
+		// into the quarantine directory.
+		require.ElementsMatch(t, []*gitalypb.LFSPointer{
+			&gitalypb.LFSPointer{
+				Oid:  text.ChompBytes(buffer.Bytes()),
+				Data: []byte(lfsPointerContents),
+				Size: int64(len(lfsPointerContents)),
+			},
+		}, receivePointers(t, stream))
+	})
+}
+
 func TestSuccessfulGetLFSPointersRequest(t *testing.T) {
 	testhelper.NewFeatureSets([]featureflag.FeatureFlag{
 		featureflag.LFSPointersUseBitmapIndex,
diff --git a/proto/blob.proto b/proto/blob.proto
index 5798a04fe..65cbfe6b3 100644
--- a/proto/blob.proto
+++ b/proto/blob.proto
@@ -25,6 +25,8 @@ service BlobService {
   // GetLFSPointers retrieves LFS pointers from a given set of object IDs.
   // This RPC filters all requested objects and only returns those which refer
   // to a valid LFS pointer.
+  //
+  // Deprecated in favor of `ListLFSPointers`, passing object IDs as revisions.
   rpc GetLFSPointers(GetLFSPointersRequest) returns (stream GetLFSPointersResponse) {
     option (op_type) = {
       op: ACCESSOR
@@ -34,6 +36,10 @@ service BlobService {
   // GetNewLFSPointers retrieves LFS pointers for a limited subset of the
   // commit graph. It will return all LFS pointers which are reachable by the
   // provided revision, but not reachable by any of the limiting references.
+  //
+  // Deprecated in favor of `ListLFSPointers`. `NotInAll` can be replaced with
+  // `REVISION` `--not` `--all`, while `NotInRefs` can be replaced with
+  // `REVISION` `--not` `NotInRevs...`.
   rpc GetNewLFSPointers(GetNewLFSPointersRequest) returns (stream GetNewLFSPointersResponse) {
     option (op_type) = {
       op: ACCESSOR
@@ -41,11 +47,35 @@ service BlobService {
   }
 
   // GetAllLFSPointers retrieves all LFS pointers of the given repository.
+  //
+  // Deprecated in favor of `ListLFSPointers`, passing `--all` as revision.
   rpc GetAllLFSPointers(GetAllLFSPointersRequest) returns (stream GetAllLFSPointersResponse) {
     option (op_type) = {
       op: ACCESSOR
     };
   }
+
+  // ListLFSPointers retrieves LFS pointers reachable from a given set of
+  // revisions by doing a graph walk. This includes both normal revisions like
+  // an object ID or branch, but also the pseudo-revisions "--all" and "--not"
+  // as documented in git-rev-parse(1). Revisions which don't directly or
+  // transitively reference any LFS pointers are ignored. It is not valid to
+  // pass revisions which do not resolve to an existing object.
+  rpc ListLFSPointers(ListLFSPointersRequest) returns (stream ListLFSPointersResponse) {
+    option (op_type) = {
+      op: ACCESSOR
+    };
+  }
+
+  // ListAllLFSPointers retrieves all LFS pointers in the repository. In
+  // contrast to `GetAllLFSPointers`, this RPC also includes LFS pointers which
+  // are not reachable by any reference.
+  rpc ListAllLFSPointers(ListAllLFSPointersRequest) returns (stream ListAllLFSPointersResponse) {
+    option (op_type) = {
+      op: ACCESSOR
+    };
+  }
+
 }
 
 message GetBlobRequest {
@@ -166,3 +196,36 @@ message GetAllLFSPointersResponse {
   // LfsPointers is the list of LFS pointers.
   repeated LFSPointer lfs_pointers = 1;
 }
+
+// ListLFSPointersRequest is a request for the ListLFSPointers RPC.
+message ListLFSPointersRequest {
+  // Repository is the repository for which LFS pointers should be retrieved
+  // from.
+  Repository repository = 1[(target_repository)=true];
+  // Revisions is the list of revisions to retrieve LFS pointers from. Must be
+  // a non-empty list.
+  repeated string revisions = 2;
+  // Limit limits the number of LFS pointers returned.
+  int32 limit = 3;
+}
+
+// ListLFSPointersResponse is a response for the ListLFSPointers RPC.
+message ListLFSPointersResponse {
+  // LfsPointers is the list of LFS pointers which were requested.
+  repeated LFSPointer lfs_pointers = 1;
+}
+
+// ListAllLFSPointersRequest is a request for the ListAllLFSPointers RPC.
+message ListAllLFSPointersRequest {
+  // Repository is the repository for which LFS pointers should be retrieved
+  // from.
+  Repository repository = 1[(target_repository)=true];
+  // Limit limits the number of LFS pointers returned.
+  int32 limit = 3;
+}
+
+// ListAllLFSPointersResponse is a response for the ListAllLFSPointers RPC.
+message ListAllLFSPointersResponse {
+  // LfsPointers is the list of LFS pointers which were requested.
+  repeated LFSPointer lfs_pointers = 1;
+}
diff --git a/proto/go/gitalypb/blob.pb.go b/proto/go/gitalypb/blob.pb.go
index b75143edb..3a76fb489 100644
--- a/proto/go/gitalypb/blob.pb.go
+++ b/proto/go/gitalypb/blob.pb.go
@@ -756,6 +756,200 @@ func (m *GetAllLFSPointersResponse) GetLfsPointers() []*LFSPointer {
 	return nil
 }
 
+// ListLFSPointersRequest is a request for the ListLFSPointers RPC.
+type ListLFSPointersRequest struct {
+	// Repository is the repository for which LFS pointers should be retrieved
+	// from.
+	Repository *Repository `protobuf:"bytes,1,opt,name=repository,proto3" json:"repository,omitempty"`
+	// Revisions is the list of revisions to retrieve LFS pointers from. Must be
+	// a non-empty list.
+	Revisions []string `protobuf:"bytes,2,rep,name=revisions,proto3" json:"revisions,omitempty"`
+	// Limit limits the number of LFS pointers returned.
+	Limit                int32    `protobuf:"varint,3,opt,name=limit,proto3" json:"limit,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListLFSPointersRequest) Reset()         { *m = ListLFSPointersRequest{} }
+func (m *ListLFSPointersRequest) String() string { return proto.CompactTextString(m) }
+func (*ListLFSPointersRequest) ProtoMessage()    {}
+func (*ListLFSPointersRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_6903d1e8a20272e8, []int{12}
+}
+
+func (m *ListLFSPointersRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListLFSPointersRequest.Unmarshal(m, b)
+}
+func (m *ListLFSPointersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListLFSPointersRequest.Marshal(b, m, deterministic)
+}
+func (m *ListLFSPointersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListLFSPointersRequest.Merge(m, src)
+}
+func (m *ListLFSPointersRequest) XXX_Size() int {
+	return xxx_messageInfo_ListLFSPointersRequest.Size(m)
+}
+func (m *ListLFSPointersRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListLFSPointersRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListLFSPointersRequest proto.InternalMessageInfo
+
+func (m *ListLFSPointersRequest) GetRepository() *Repository {
+	if m != nil {
+		return m.Repository
+	}
+	return nil
+}
+
+func (m *ListLFSPointersRequest) GetRevisions() []string {
+	if m != nil {
+		return m.Revisions
+	}
+	return nil
+}
+
+func (m *ListLFSPointersRequest) GetLimit() int32 {
+	if m != nil {
+		return m.Limit
+	}
+	return 0
+}
+
+// ListLFSPointersResponse is a response for the ListLFSPointers RPC.
+type ListLFSPointersResponse struct {
+	// LfsPointers is the list of LFS pointers which were requested.
+	LfsPointers          []*LFSPointer `protobuf:"bytes,1,rep,name=lfs_pointers,json=lfsPointers,proto3" json:"lfs_pointers,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *ListLFSPointersResponse) Reset()         { *m = ListLFSPointersResponse{} }
+func (m *ListLFSPointersResponse) String() string { return proto.CompactTextString(m) }
+func (*ListLFSPointersResponse) ProtoMessage()    {}
+func (*ListLFSPointersResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_6903d1e8a20272e8, []int{13}
+}
+
+func (m *ListLFSPointersResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListLFSPointersResponse.Unmarshal(m, b)
+}
+func (m *ListLFSPointersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListLFSPointersResponse.Marshal(b, m, deterministic)
+}
+func (m *ListLFSPointersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListLFSPointersResponse.Merge(m, src)
+}
+func (m *ListLFSPointersResponse) XXX_Size() int {
+	return xxx_messageInfo_ListLFSPointersResponse.Size(m)
+}
+func (m *ListLFSPointersResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListLFSPointersResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListLFSPointersResponse proto.InternalMessageInfo
+
+func (m *ListLFSPointersResponse) GetLfsPointers() []*LFSPointer {
+	if m != nil {
+		return m.LfsPointers
+	}
+	return nil
+}
+
+// ListAllLFSPointersRequest is a request for the ListAllLFSPointers RPC.
+type ListAllLFSPointersRequest struct {
+	// Repository is the repository for which LFS pointers should be retrieved
+	// from.
+	Repository *Repository `protobuf:"bytes,1,opt,name=repository,proto3" json:"repository,omitempty"`
+	// Limit limits the number of LFS pointers returned.
+	Limit                int32    `protobuf:"varint,3,opt,name=limit,proto3" json:"limit,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ListAllLFSPointersRequest) Reset()         { *m = ListAllLFSPointersRequest{} }
+func (m *ListAllLFSPointersRequest) String() string { return proto.CompactTextString(m) }
+func (*ListAllLFSPointersRequest) ProtoMessage()    {}
+func (*ListAllLFSPointersRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_6903d1e8a20272e8, []int{14}
+}
+
+func (m *ListAllLFSPointersRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListAllLFSPointersRequest.Unmarshal(m, b)
+}
+func (m *ListAllLFSPointersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListAllLFSPointersRequest.Marshal(b, m, deterministic)
+}
+func (m *ListAllLFSPointersRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListAllLFSPointersRequest.Merge(m, src)
+}
+func (m *ListAllLFSPointersRequest) XXX_Size() int {
+	return xxx_messageInfo_ListAllLFSPointersRequest.Size(m)
+}
+func (m *ListAllLFSPointersRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListAllLFSPointersRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListAllLFSPointersRequest proto.InternalMessageInfo
+
+func (m *ListAllLFSPointersRequest) GetRepository() *Repository {
+	if m != nil {
+		return m.Repository
+	}
+	return nil
+}
+
+func (m *ListAllLFSPointersRequest) GetLimit() int32 {
+	if m != nil {
+		return m.Limit
+	}
+	return 0
+}
+
+// ListAllLFSPointersResponse is a response for the ListAllLFSPointers RPC.
+type ListAllLFSPointersResponse struct {
+	// LfsPointers is the list of LFS pointers which were requested.
+	LfsPointers          []*LFSPointer `protobuf:"bytes,1,rep,name=lfs_pointers,json=lfsPointers,proto3" json:"lfs_pointers,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *ListAllLFSPointersResponse) Reset()         { *m = ListAllLFSPointersResponse{} }
+func (m *ListAllLFSPointersResponse) String() string { return proto.CompactTextString(m) }
+func (*ListAllLFSPointersResponse) ProtoMessage()    {}
+func (*ListAllLFSPointersResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_6903d1e8a20272e8, []int{15}
+}
+
+func (m *ListAllLFSPointersResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListAllLFSPointersResponse.Unmarshal(m, b)
+}
+func (m *ListAllLFSPointersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListAllLFSPointersResponse.Marshal(b, m, deterministic)
+}
+func (m *ListAllLFSPointersResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListAllLFSPointersResponse.Merge(m, src)
+}
+func (m *ListAllLFSPointersResponse) XXX_Size() int {
+	return xxx_messageInfo_ListAllLFSPointersResponse.Size(m)
+}
+func (m *ListAllLFSPointersResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListAllLFSPointersResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListAllLFSPointersResponse proto.InternalMessageInfo
+
+func (m *ListAllLFSPointersResponse) GetLfsPointers() []*LFSPointer {
+	if m != nil {
+		return m.LfsPointers
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterType((*GetBlobRequest)(nil), "gitaly.GetBlobRequest")
 	proto.RegisterType((*GetBlobResponse)(nil), "gitaly.GetBlobResponse")
@@ -770,55 +964,64 @@ func init() {
 	proto.RegisterType((*GetNewLFSPointersResponse)(nil), "gitaly.GetNewLFSPointersResponse")
 	proto.RegisterType((*GetAllLFSPointersRequest)(nil), "gitaly.GetAllLFSPointersRequest")
 	proto.RegisterType((*GetAllLFSPointersResponse)(nil), "gitaly.GetAllLFSPointersResponse")
+	proto.RegisterType((*ListLFSPointersRequest)(nil), "gitaly.ListLFSPointersRequest")
+	proto.RegisterType((*ListLFSPointersResponse)(nil), "gitaly.ListLFSPointersResponse")
+	proto.RegisterType((*ListAllLFSPointersRequest)(nil), "gitaly.ListAllLFSPointersRequest")
+	proto.RegisterType((*ListAllLFSPointersResponse)(nil), "gitaly.ListAllLFSPointersResponse")
 }
 
 func init() { proto.RegisterFile("blob.proto", fileDescriptor_6903d1e8a20272e8) }
 
 var fileDescriptor_6903d1e8a20272e8 = []byte{
-	// 676 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xc1, 0x6e, 0xd3, 0x40,
-	0x10, 0x95, 0xe3, 0x24, 0x75, 0x26, 0x69, 0x29, 0x2b, 0x68, 0x5d, 0x0b, 0x2a, 0xd7, 0x42, 0xc8,
-	0x07, 0x48, 0xaa, 0x22, 0x24, 0x4e, 0x48, 0xad, 0x50, 0xa3, 0x52, 0xd4, 0x56, 0x5b, 0x2e, 0xf4,
-	0x12, 0xd9, 0xf5, 0xa6, 0x5d, 0xb4, 0xf1, 0x1a, 0xef, 0xb6, 0x55, 0xf8, 0x11, 0xf8, 0x1b, 0x2e,
-	0x88, 0x9f, 0xe0, 0x1f, 0xf8, 0x00, 0x4e, 0xc8, 0x6b, 0x3b, 0x76, 0xe2, 0x84, 0x4b, 0x7a, 0xdb,
-	0x99, 0xd9, 0x99, 0xf7, 0x66, 0xe6, 0x79, 0x0d, 0xe0, 0x33, 0xee, 0x77, 0xa3, 0x98, 0x4b, 0x8e,
-	0x9a, 0x57, 0x54, 0x7a, 0x6c, 0x6c, 0x01, 0xa3, 0xa1, 0x4c, 0x7d, 0x56, 0x47, 0x5c, 0x7b, 0x31,
-	0x09, 0x52, 0xcb, 0x89, 0x61, 0xad, 0x4f, 0xe4, 0x01, 0xe3, 0x3e, 0x26, 0x5f, 0x6e, 0x88, 0x90,
-	0xe8, 0x0d, 0x40, 0x4c, 0x22, 0x2e, 0xa8, 0xe4, 0xf1, 0xd8, 0xd4, 0x6c, 0xcd, 0x6d, 0xef, 0xa1,
-	0x6e, 0x5a, 0xa8, 0x8b, 0x27, 0x91, 0x83, 0xfa, 0xf7, 0x5f, 0x2f, 0x34, 0x5c, 0xba, 0x8b, 0xd6,
-	0x41, 0xe7, 0x34, 0x30, 0x6b, 0xb6, 0xe6, 0xb6, 0x70, 0x72, 0x44, 0x8f, 0xa0, 0xc1, 0xe8, 0x88,
-	0x4a, 0x53, 0xb7, 0x35, 0x57, 0xc7, 0xa9, 0xe1, 0x1c, 0xc3, 0x83, 0x09, 0xa6, 0x88, 0x78, 0x28,
-	0x08, 0x42, 0x50, 0x17, 0xf4, 0x2b, 0x51, 0x70, 0x3a, 0x56, 0xe7, 0xc4, 0x17, 0x78, 0xd2, 0x53,
-	0xf5, 0x3a, 0x58, 0x9d, 0x73, 0x08, 0x7d, 0x02, 0xe1, 0xfc, 0xd1, 0x26, 0xd5, 0xc4, 0xf2, 0x2d,
-	0x1c, 0xc3, 0x5a, 0x4c, 0x6e, 0xa9, 0xa0, 0x3c, 0x1c, 0x44, 0x9e, 0xbc, 0x16, 0x66, 0xcd, 0xd6,
-	0xdd, 0xf6, 0xde, 0xb3, 0x3c, 0x7b, 0x06, 0xaa, 0x8b, 0xb3, 0xdb, 0x67, 0x9e, 0xbc, 0xc6, 0xab,
-	0x71, 0xc9, 0x12, 0xf3, 0xbb, 0xb7, 0xde, 0x42, 0xa7, 0x9c, 0x84, 0x2c, 0x30, 0xf2, 0x34, 0x45,
-	0xb5, 0x85, 0x27, 0x76, 0x32, 0x82, 0x84, 0x45, 0x3e, 0x82, 0xe4, 0xec, 0xfc, 0xd6, 0x60, 0xbd,
-	0x60, 0xb1, 0xec, 0xfc, 0xd0, 0x0e, 0x74, 0xa8, 0x18, 0x88, 0x1b, 0x7f, 0xc4, 0x83, 0x1b, 0x46,
-	0xcc, 0xba, 0xad, 0xb9, 0x06, 0x6e, 0x53, 0x71, 0x9e, 0xbb, 0x92, 0x42, 0x23, 0x1e, 0x10, 0xb3,
-	0x61, 0x6b, 0x6e, 0x03, 0xab, 0xf3, 0x14, 0xeb, 0xe6, 0x02, 0xd6, 0x2b, 0x05, 0x6b, 0xf4, 0x1c,
-	0xea, 0x72, 0x1c, 0x11, 0xd3, 0xb0, 0x35, 0x77, 0xad, 0x58, 0xc6, 0xa9, 0xff, 0x99, 0x5c, 0xca,
-	0x8f, 0xe3, 0x88, 0x60, 0x15, 0x77, 0x0e, 0x01, 0x3e, 0x1c, 0x9e, 0x9f, 0x71, 0x1a, 0x4a, 0x12,
-	0x2f, 0x21, 0x8b, 0x23, 0x58, 0x3d, 0x21, 0x77, 0xc9, 0x90, 0x52, 0x88, 0xb9, 0xa5, 0xaa, 0x82,
-	0xcd, 0xa9, 0xeb, 0xa5, 0x81, 0x33, 0x78, 0xdc, 0x27, 0xb2, 0x60, 0x75, 0x0f, 0x32, 0xdb, 0x02,
-	0x23, 0xf9, 0x4a, 0x07, 0x34, 0x48, 0x05, 0xd6, 0xc2, 0x2b, 0x89, 0x7d, 0x14, 0x08, 0xe7, 0x14,
-	0x36, 0x66, 0xd1, 0xb2, 0x1d, 0xbf, 0x86, 0x0e, 0x1b, 0x8a, 0x41, 0x94, 0xf9, 0x4d, 0x4d, 0x29,
-	0x73, 0x02, 0x58, 0xa4, 0xe0, 0x36, 0x1b, 0x8a, 0x3c, 0xdd, 0xf9, 0xa9, 0x81, 0xd9, 0x27, 0xf2,
-	0x84, 0xdc, 0xdd, 0x6b, 0x0b, 0x65, 0x01, 0xa4, 0xab, 0x28, 0x04, 0x30, 0x25, 0xfc, 0x46, 0x26,
-	0x7c, 0xf4, 0x04, 0x20, 0xe4, 0x72, 0x40, 0xc3, 0x81, 0xc7, 0x58, 0xa6, 0x33, 0x23, 0xe4, 0xf2,
-	0x28, 0xdc, 0x67, 0x0c, 0x6d, 0x43, 0x3b, 0x8b, 0xc6, 0x64, 0x28, 0xcc, 0x86, 0xad, 0xbb, 0x1d,
-	0xdc, 0x52, 0x61, 0x4c, 0x86, 0xc2, 0xc1, 0xb0, 0x35, 0xa7, 0x8b, 0xe5, 0x46, 0x73, 0xa1, 0x26,
-	0xb3, 0xcf, 0xd8, 0x7d, 0x4e, 0xe6, 0x7d, 0xdd, 0xa8, 0xad, 0xeb, 0x19, 0xdf, 0xd9, 0xda, 0x4b,
-	0xf1, 0xdd, 0xfb, 0xa1, 0x43, 0x3b, 0x91, 0xf4, 0x39, 0x89, 0x6f, 0xe9, 0x25, 0x41, 0xef, 0x60,
-	0x25, 0x7b, 0x09, 0xd0, 0xc6, 0xcc, 0x03, 0x95, 0xb5, 0x61, 0x6d, 0x56, 0xfc, 0x29, 0x05, 0xa7,
-	0xf9, 0xf7, 0x9b, 0x5b, 0x33, 0x6a, 0xbb, 0x1a, 0xea, 0x83, 0x91, 0xbf, 0x27, 0x68, 0x73, 0xc1,
-	0x3b, 0x67, 0x99, 0xd5, 0x40, 0xa5, 0xd0, 0x27, 0xf5, 0x2f, 0x29, 0xf5, 0x8b, 0x9e, 0x96, 0xb2,
-	0xaa, 0x33, 0xb6, 0xb6, 0x17, 0x85, 0x2b, 0xa5, 0x7d, 0x78, 0x58, 0xd9, 0x3e, 0xb2, 0x4b, 0xe9,
-	0x73, 0xe5, 0x6d, 0xed, 0xfc, 0xe7, 0xc6, 0x02, 0x8c, 0xe9, 0x8d, 0x4d, 0x61, 0xcc, 0x15, 0xca,
-	0x14, 0xc6, 0xfc, 0x75, 0x17, 0x18, 0x07, 0xbb, 0x17, 0xc9, 0x6d, 0xe6, 0xf9, 0xdd, 0x4b, 0x3e,
-	0xea, 0xa5, 0xc7, 0x97, 0x3c, 0xbe, 0xea, 0xa5, 0x35, 0x7a, 0xea, 0xa7, 0xdc, 0xbb, 0xe2, 0x99,
-	0x1d, 0xf9, 0x7e, 0x53, 0xb9, 0x5e, 0xfd, 0x0b, 0x00, 0x00, 0xff, 0xff, 0xf6, 0x92, 0xe4, 0xc3,
-	0xd7, 0x07, 0x00, 0x00,
+	// 756 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcd, 0x6e, 0xd3, 0x40,
+	0x10, 0x96, 0xe3, 0x24, 0x75, 0x26, 0xe9, 0x0f, 0x2b, 0x68, 0x5d, 0xab, 0x14, 0xd7, 0x42, 0xc8,
+	0x07, 0x48, 0xaa, 0x22, 0x24, 0x4e, 0x48, 0xad, 0x50, 0xa3, 0xd2, 0xaa, 0xad, 0x36, 0x5c, 0xa8,
+	0x90, 0x22, 0xbb, 0xd9, 0xb4, 0x0b, 0x1b, 0xaf, 0xf1, 0x6e, 0x5b, 0x85, 0x33, 0xe2, 0x15, 0xe0,
+	0x81, 0x10, 0x2f, 0xc1, 0x3b, 0xf0, 0x00, 0x9c, 0x90, 0xff, 0x12, 0x27, 0x76, 0x7a, 0x49, 0x6e,
+	0xbb, 0x33, 0x3b, 0xf3, 0x7d, 0x33, 0xf3, 0x79, 0xd7, 0x00, 0x2e, 0xe3, 0x6e, 0xd3, 0x0f, 0xb8,
+	0xe4, 0xa8, 0x7a, 0x45, 0xa5, 0xc3, 0x86, 0x06, 0x30, 0xea, 0xc9, 0xd8, 0x66, 0x34, 0xc4, 0xb5,
+	0x13, 0x90, 0x5e, 0xbc, 0xb3, 0x02, 0x58, 0x69, 0x13, 0x79, 0xc0, 0xb8, 0x8b, 0xc9, 0x97, 0x1b,
+	0x22, 0x24, 0x7a, 0x0d, 0x10, 0x10, 0x9f, 0x0b, 0x2a, 0x79, 0x30, 0xd4, 0x15, 0x53, 0xb1, 0xeb,
+	0x7b, 0xa8, 0x19, 0x27, 0x6a, 0xe2, 0x91, 0xe7, 0xa0, 0xfc, 0xf3, 0xf7, 0x73, 0x05, 0x67, 0xce,
+	0xa2, 0x35, 0x50, 0x39, 0xed, 0xe9, 0x25, 0x53, 0xb1, 0x6b, 0x38, 0x5c, 0xa2, 0x87, 0x50, 0x61,
+	0x74, 0x40, 0xa5, 0xae, 0x9a, 0x8a, 0xad, 0xe2, 0x78, 0x63, 0x1d, 0xc3, 0xea, 0x08, 0x53, 0xf8,
+	0xdc, 0x13, 0x04, 0x21, 0x28, 0x0b, 0xfa, 0x95, 0x44, 0x70, 0x2a, 0x8e, 0xd6, 0xa1, 0xad, 0xe7,
+	0x48, 0x27, 0xca, 0xd7, 0xc0, 0xd1, 0x3a, 0x85, 0x50, 0x47, 0x10, 0xd6, 0x5f, 0x65, 0x94, 0x4d,
+	0xcc, 0x5f, 0xc2, 0x31, 0xac, 0x04, 0xe4, 0x96, 0x0a, 0xca, 0xbd, 0xae, 0xef, 0xc8, 0x6b, 0xa1,
+	0x97, 0x4c, 0xd5, 0xae, 0xef, 0x3d, 0x4d, 0xa3, 0xa7, 0xa0, 0x9a, 0x38, 0x39, 0x7d, 0xee, 0xc8,
+	0x6b, 0xbc, 0x1c, 0x64, 0x76, 0xa2, 0xb8, 0x7a, 0xe3, 0x0d, 0x34, 0xb2, 0x41, 0xc8, 0x00, 0x2d,
+	0x0d, 0x8b, 0xa8, 0xd6, 0xf0, 0x68, 0x1f, 0xb6, 0x20, 0x64, 0x91, 0xb6, 0x20, 0x5c, 0x5b, 0x7f,
+	0x14, 0x58, 0x1b, 0xb3, 0x98, 0xb7, 0x7f, 0x68, 0x07, 0x1a, 0x54, 0x74, 0xc5, 0x8d, 0x3b, 0xe0,
+	0xbd, 0x1b, 0x46, 0xf4, 0xb2, 0xa9, 0xd8, 0x1a, 0xae, 0x53, 0xd1, 0x49, 0x4d, 0x61, 0xa2, 0x01,
+	0xef, 0x11, 0xbd, 0x62, 0x2a, 0x76, 0x05, 0x47, 0xeb, 0x09, 0xd6, 0xd5, 0x19, 0xac, 0x97, 0xc6,
+	0xac, 0xd1, 0x33, 0x28, 0xcb, 0xa1, 0x4f, 0x74, 0xcd, 0x54, 0xec, 0x95, 0xf1, 0x30, 0xce, 0xdc,
+	0x4f, 0xe4, 0x52, 0xbe, 0x1f, 0xfa, 0x04, 0x47, 0x7e, 0xeb, 0x10, 0xe0, 0xe4, 0xb0, 0x73, 0xce,
+	0xa9, 0x27, 0x49, 0x30, 0x87, 0x2c, 0x8e, 0x60, 0xf9, 0x94, 0xdc, 0x85, 0x4d, 0x8a, 0x21, 0x0a,
+	0x53, 0xe5, 0x05, 0x9b, 0x52, 0x57, 0x33, 0x0d, 0x67, 0xf0, 0xa8, 0x4d, 0xe4, 0x98, 0xd5, 0x02,
+	0x64, 0xb6, 0x09, 0x5a, 0xf8, 0x95, 0x76, 0x69, 0x2f, 0x16, 0x58, 0x0d, 0x2f, 0x85, 0xfb, 0xa3,
+	0x9e, 0xb0, 0xce, 0x60, 0x7d, 0x1a, 0x2d, 0x99, 0xf1, 0x2b, 0x68, 0xb0, 0xbe, 0xe8, 0xfa, 0x89,
+	0x5d, 0x57, 0x22, 0x65, 0x8e, 0x00, 0xc7, 0x21, 0xb8, 0xce, 0xfa, 0x22, 0x0d, 0xb7, 0x7e, 0x29,
+	0xa0, 0xb7, 0x89, 0x3c, 0x25, 0x77, 0x0b, 0x2d, 0x21, 0x2b, 0x80, 0x78, 0x14, 0x63, 0x01, 0x4c,
+	0x08, 0xbf, 0x92, 0x08, 0x1f, 0x6d, 0x01, 0x78, 0x5c, 0x76, 0xa9, 0xd7, 0x75, 0x18, 0x4b, 0x74,
+	0xa6, 0x79, 0x5c, 0x1e, 0x79, 0xfb, 0x8c, 0xa1, 0x6d, 0xa8, 0x27, 0xde, 0x80, 0xf4, 0x85, 0x5e,
+	0x31, 0x55, 0xbb, 0x81, 0x6b, 0x91, 0x1b, 0x93, 0xbe, 0xb0, 0x30, 0x6c, 0x16, 0x54, 0x31, 0x5f,
+	0x6b, 0x2e, 0xa2, 0xce, 0xec, 0x33, 0xb6, 0xc8, 0xce, 0xbc, 0x2b, 0x6b, 0xa5, 0x35, 0x35, 0xe1,
+	0x3b, 0x9d, 0x7b, 0x3e, 0xbe, 0xdf, 0x15, 0x58, 0x3f, 0xa1, 0x62, 0xb1, 0x5a, 0xdc, 0x82, 0x5a,
+	0x3a, 0xb8, 0x54, 0x8c, 0x63, 0x43, 0xf1, 0x28, 0xad, 0x73, 0xd8, 0xc8, 0xf1, 0x98, 0xaf, 0xb4,
+	0xcf, 0xb0, 0x19, 0x66, 0x5c, 0xf0, 0x2c, 0x66, 0xd0, 0xef, 0x80, 0x51, 0x04, 0x36, 0x57, 0x05,
+	0x7b, 0xdf, 0x2a, 0x50, 0x0f, 0xef, 0x9b, 0x0e, 0x09, 0x6e, 0xe9, 0x25, 0x41, 0x6f, 0x61, 0x29,
+	0xb9, 0xa6, 0xd1, 0xfa, 0xd4, 0xeb, 0x91, 0xd4, 0x65, 0x6c, 0xe4, 0xec, 0x31, 0x05, 0xab, 0xfa,
+	0xef, 0x87, 0x5d, 0xd2, 0x4a, 0xbb, 0x0a, 0x6a, 0x83, 0x96, 0x5e, 0xf6, 0x68, 0x63, 0xc6, 0x23,
+	0x64, 0xe8, 0x79, 0x47, 0x2e, 0xd1, 0x87, 0xe8, 0xa1, 0xcf, 0xd4, 0x8b, 0x1e, 0x67, 0xa2, 0xf2,
+	0x4d, 0x37, 0xb6, 0x67, 0xb9, 0x73, 0xa9, 0x5d, 0x78, 0x90, 0xfb, 0x34, 0x91, 0x99, 0x09, 0x2f,
+	0xbc, 0x7b, 0x8c, 0x9d, 0x7b, 0x4e, 0xcc, 0xc0, 0x98, 0x9c, 0xd8, 0x04, 0x46, 0xa1, 0x72, 0x26,
+	0x30, 0x8a, 0xc7, 0x9d, 0xc1, 0xf8, 0x08, 0xab, 0x53, 0xaa, 0x46, 0xa3, 0x26, 0x14, 0x7f, 0x76,
+	0xc6, 0x93, 0x99, 0xfe, 0x5c, 0x76, 0x02, 0x28, 0x2f, 0x3a, 0xb4, 0x93, 0x4d, 0x50, 0x5c, 0x83,
+	0x75, 0xdf, 0x91, 0x69, 0x98, 0x83, 0xdd, 0x8b, 0xf0, 0x38, 0x73, 0xdc, 0xe6, 0x25, 0x1f, 0xb4,
+	0xe2, 0xe5, 0x0b, 0x1e, 0x5c, 0xb5, 0xe2, 0x24, 0xad, 0xe8, 0xb7, 0xaf, 0x75, 0xc5, 0x93, 0xbd,
+	0xef, 0xba, 0xd5, 0xc8, 0xf4, 0xf2, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xbd, 0x71, 0xf0, 0xaa,
+	0x39, 0x0a, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -841,13 +1044,32 @@ type BlobServiceClient interface {
 	// GetLFSPointers retrieves LFS pointers from a given set of object IDs.
 	// This RPC filters all requested objects and only returns those which refer
 	// to a valid LFS pointer.
+	//
+	// Deprecated in favor of `ListLFSPointers`, passing object IDs as revisions.
 	GetLFSPointers(ctx context.Context, in *GetLFSPointersRequest, opts ...grpc.CallOption) (BlobService_GetLFSPointersClient, error)
 	// GetNewLFSPointers retrieves LFS pointers for a limited subset of the
 	// commit graph. It will return all LFS pointers which are reachable by the
 	// provided revision, but not reachable by any of the limiting references.
+	//
+	// Deprecated in favor of `ListLFSPointers`. `NotInAll` can be replaced with
+	// `REVISION` `--not` `--all`, while `NotInRefs` can be replaced with
+	// `REVISION` `--not` `NotInRevs...`.
 	GetNewLFSPointers(ctx context.Context, in *GetNewLFSPointersRequest, opts ...grpc.CallOption) (BlobService_GetNewLFSPointersClient, error)
 	// GetAllLFSPointers retrieves all LFS pointers of the given repository.
+	//
+	// Deprecated in favor of `ListLFSPointers`, passing `--all` as revision.
 	GetAllLFSPointers(ctx context.Context, in *GetAllLFSPointersRequest, opts ...grpc.CallOption) (BlobService_GetAllLFSPointersClient, error)
+	// ListLFSPointers retrieves LFS pointers reachable from a given set of
+	// revisions by doing a graph walk. This includes both normal revisions like
+	// an object ID or branch, but also the pseudo-revisions "--all" and "--not"
+	// as documented in git-rev-parse(1). Revisions which don't directly or
+	// transitively reference any LFS pointers are ignored. It is not valid to
+	// pass revisions which do not resolve to an existing object.
+	ListLFSPointers(ctx context.Context, in *ListLFSPointersRequest, opts ...grpc.CallOption) (BlobService_ListLFSPointersClient, error)
+	// ListAllLFSPointers retrieves all LFS pointers in the repository. In
+	// contrast to `GetAllLFSPointers`, this RPC also includes LFS pointers which
+	// are not reachable by any reference.
+	ListAllLFSPointers(ctx context.Context, in *ListAllLFSPointersRequest, opts ...grpc.CallOption) (BlobService_ListAllLFSPointersClient, error)
 }
 
 type blobServiceClient struct {
@@ -1018,6 +1240,70 @@ func (x *blobServiceGetAllLFSPointersClient) Recv() (*GetAllLFSPointersResponse,
 	return m, nil
 }
 
+func (c *blobServiceClient) ListLFSPointers(ctx context.Context, in *ListLFSPointersRequest, opts ...grpc.CallOption) (BlobService_ListLFSPointersClient, error) {
+	stream, err := c.cc.NewStream(ctx, &_BlobService_serviceDesc.Streams[5], "/gitaly.BlobService/ListLFSPointers", opts...)
+	if err != nil {
+		return nil, err
+	}
+	x := &blobServiceListLFSPointersClient{stream}
+	if err := x.ClientStream.SendMsg(in); err != nil {
+		return nil, err
+	}
+	if err := x.ClientStream.CloseSend(); err != nil {
+		return nil, err
+	}
+	return x, nil
+}
+
+type BlobService_ListLFSPointersClient interface {
+	Recv() (*ListLFSPointersResponse, error)
+	grpc.ClientStream
+}
+
+type blobServiceListLFSPointersClient struct {
+	grpc.ClientStream
+}
+
+func (x *blobServiceListLFSPointersClient) Recv() (*ListLFSPointersResponse, error) {
+	m := new(ListLFSPointersResponse)
+	if err := x.ClientStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
+func (c *blobServiceClient) ListAllLFSPointers(ctx context.Context, in *ListAllLFSPointersRequest, opts ...grpc.CallOption) (BlobService_ListAllLFSPointersClient, error) {
+	stream, err := c.cc.NewStream(ctx, &_BlobService_serviceDesc.Streams[6], "/gitaly.BlobService/ListAllLFSPointers", opts...)
+	if err != nil {
+		return nil, err
+	}
+	x := &blobServiceListAllLFSPointersClient{stream}
+	if err := x.ClientStream.SendMsg(in); err != nil {
+		return nil, err
+	}
+	if err := x.ClientStream.CloseSend(); err != nil {
+		return nil, err
+	}
+	return x, nil
+}
+
+type BlobService_ListAllLFSPointersClient interface {
+	Recv() (*ListAllLFSPointersResponse, error)
+	grpc.ClientStream
+}
+
+type blobServiceListAllLFSPointersClient struct {
+	grpc.ClientStream
+}
+
+func (x *blobServiceListAllLFSPointersClient) Recv() (*ListAllLFSPointersResponse, error) {
+	m := new(ListAllLFSPointersResponse)
+	if err := x.ClientStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
 // BlobServiceServer is the server API for BlobService service.
 type BlobServiceServer interface {
 	// GetBlob returns the contents of a blob object referenced by its object
@@ -1028,13 +1314,32 @@ type BlobServiceServer interface {
 	// GetLFSPointers retrieves LFS pointers from a given set of object IDs.
 	// This RPC filters all requested objects and only returns those which refer
 	// to a valid LFS pointer.
+	//
+	// Deprecated in favor of `ListLFSPointers`, passing object IDs as revisions.
 	GetLFSPointers(*GetLFSPointersRequest, BlobService_GetLFSPointersServer) error
 	// GetNewLFSPointers retrieves LFS pointers for a limited subset of the
 	// commit graph. It will return all LFS pointers which are reachable by the
 	// provided revision, but not reachable by any of the limiting references.
+	//
+	// Deprecated in favor of `ListLFSPointers`. `NotInAll` can be replaced with
+	// `REVISION` `--not` `--all`, while `NotInRefs` can be replaced with
+	// `REVISION` `--not` `NotInRevs...`.
 	GetNewLFSPointers(*GetNewLFSPointersRequest, BlobService_GetNewLFSPointersServer) error
 	// GetAllLFSPointers retrieves all LFS pointers of the given repository.
+	//
+	// Deprecated in favor of `ListLFSPointers`, passing `--all` as revision.
 	GetAllLFSPointers(*GetAllLFSPointersRequest, BlobService_GetAllLFSPointersServer) error
+	// ListLFSPointers retrieves LFS pointers reachable from a given set of
+	// revisions by doing a graph walk. This includes both normal revisions like
+	// an object ID or branch, but also the pseudo-revisions "--all" and "--not"
+	// as documented in git-rev-parse(1). Revisions which don't directly or
+	// transitively reference any LFS pointers are ignored. It is not valid to
+	// pass revisions which do not resolve to an existing object.
+	ListLFSPointers(*ListLFSPointersRequest, BlobService_ListLFSPointersServer) error
+	// ListAllLFSPointers retrieves all LFS pointers in the repository. In
+	// contrast to `GetAllLFSPointers`, this RPC also includes LFS pointers which
+	// are not reachable by any reference.
+	ListAllLFSPointers(*ListAllLFSPointersRequest, BlobService_ListAllLFSPointersServer) error
 }
 
 // UnimplementedBlobServiceServer can be embedded to have forward compatible implementations.
@@ -1056,6 +1361,12 @@ func (*UnimplementedBlobServiceServer) GetNewLFSPointers(req *GetNewLFSPointersR
 func (*UnimplementedBlobServiceServer) GetAllLFSPointers(req *GetAllLFSPointersRequest, srv BlobService_GetAllLFSPointersServer) error {
 	return status.Errorf(codes.Unimplemented, "method GetAllLFSPointers not implemented")
 }
+func (*UnimplementedBlobServiceServer) ListLFSPointers(req *ListLFSPointersRequest, srv BlobService_ListLFSPointersServer) error {
+	return status.Errorf(codes.Unimplemented, "method ListLFSPointers not implemented")
+}
+func (*UnimplementedBlobServiceServer) ListAllLFSPointers(req *ListAllLFSPointersRequest, srv BlobService_ListAllLFSPointersServer) error {
+	return status.Errorf(codes.Unimplemented, "method ListAllLFSPointers not implemented")
+}
 
 func RegisterBlobServiceServer(s *grpc.Server, srv BlobServiceServer) {
 	s.RegisterService(&_BlobService_serviceDesc, srv)
@@ -1166,6 +1477,48 @@ func (x *blobServiceGetAllLFSPointersServer) Send(m *GetAllLFSPointersResponse)
 	return x.ServerStream.SendMsg(m)
 }
 
+func _BlobService_ListLFSPointers_Handler(srv interface{}, stream grpc.ServerStream) error {
+	m := new(ListLFSPointersRequest)
+	if err := stream.RecvMsg(m); err != nil {
+		return err
+	}
+	return srv.(BlobServiceServer).ListLFSPointers(m, &blobServiceListLFSPointersServer{stream})
+}
+
+type BlobService_ListLFSPointersServer interface {
+	Send(*ListLFSPointersResponse) error
+	grpc.ServerStream
+}
+
+type blobServiceListLFSPointersServer struct {
+	grpc.ServerStream
+}
+
+func (x *blobServiceListLFSPointersServer) Send(m *ListLFSPointersResponse) error {
+	return x.ServerStream.SendMsg(m)
+}
+
+func _BlobService_ListAllLFSPointers_Handler(srv interface{}, stream grpc.ServerStream) error {
+	m := new(ListAllLFSPointersRequest)
+	if err := stream.RecvMsg(m); err != nil {
+		return err
+	}
+	return srv.(BlobServiceServer).ListAllLFSPointers(m, &blobServiceListAllLFSPointersServer{stream})
+}
+
+type BlobService_ListAllLFSPointersServer interface {
+	Send(*ListAllLFSPointersResponse) error
+	grpc.ServerStream
+}
+
+type blobServiceListAllLFSPointersServer struct {
+	grpc.ServerStream
+}
+
+func (x *blobServiceListAllLFSPointersServer) Send(m *ListAllLFSPointersResponse) error {
+	return x.ServerStream.SendMsg(m)
+}
+
 var _BlobService_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "gitaly.BlobService",
 	HandlerType: (*BlobServiceServer)(nil),
@@ -1196,6 +1549,16 @@ var _BlobService_serviceDesc = grpc.ServiceDesc{
 			Handler:       _BlobService_GetAllLFSPointers_Handler,
 			ServerStreams: true,
 		},
+		{
+			StreamName:    "ListLFSPointers",
+			Handler:       _BlobService_ListLFSPointers_Handler,
+			ServerStreams: true,
+		},
+		{
+			StreamName:    "ListAllLFSPointers",
+			Handler:       _BlobService_ListAllLFSPointers_Handler,
+			ServerStreams: true,
+		},
 	},
 	Metadata: "blob.proto",
 }
diff --git a/ruby/proto/gitaly/blob_pb.rb b/ruby/proto/gitaly/blob_pb.rb
index 084f0facc..e6e6b1ed6 100644
--- a/ruby/proto/gitaly/blob_pb.rb
+++ b/ruby/proto/gitaly/blob_pb.rb
@@ -69,6 +69,21 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     add_message "gitaly.GetAllLFSPointersResponse" do
       repeated :lfs_pointers, :message, 1, "gitaly.LFSPointer"
     end
+    add_message "gitaly.ListLFSPointersRequest" do
+      optional :repository, :message, 1, "gitaly.Repository"
+      repeated :revisions, :string, 2
+      optional :limit, :int32, 3
+    end
+    add_message "gitaly.ListLFSPointersResponse" do
+      repeated :lfs_pointers, :message, 1, "gitaly.LFSPointer"
+    end
+    add_message "gitaly.ListAllLFSPointersRequest" do
+      optional :repository, :message, 1, "gitaly.Repository"
+      optional :limit, :int32, 3
+    end
+    add_message "gitaly.ListAllLFSPointersResponse" do
+      repeated :lfs_pointers, :message, 1, "gitaly.LFSPointer"
+    end
   end
 end
 
@@ -86,4 +101,8 @@ module Gitaly
   GetNewLFSPointersResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.GetNewLFSPointersResponse").msgclass
   GetAllLFSPointersRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.GetAllLFSPointersRequest").msgclass
   GetAllLFSPointersResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.GetAllLFSPointersResponse").msgclass
+  ListLFSPointersRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ListLFSPointersRequest").msgclass
+  ListLFSPointersResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ListLFSPointersResponse").msgclass
+  ListAllLFSPointersRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ListAllLFSPointersRequest").msgclass
+  ListAllLFSPointersResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ListAllLFSPointersResponse").msgclass
 end
diff --git a/ruby/proto/gitaly/blob_services_pb.rb b/ruby/proto/gitaly/blob_services_pb.rb
index 149e27c81..21a3bc6e5 100644
--- a/ruby/proto/gitaly/blob_services_pb.rb
+++ b/ruby/proto/gitaly/blob_services_pb.rb
@@ -22,13 +22,32 @@ module Gitaly
       # GetLFSPointers retrieves LFS pointers from a given set of object IDs.
       # This RPC filters all requested objects and only returns those which refer
       # to a valid LFS pointer.
+      #
+      # Deprecated in favor of `ListLFSPointers`, passing object IDs as revisions.
       rpc :GetLFSPointers, Gitaly::GetLFSPointersRequest, stream(Gitaly::GetLFSPointersResponse)
       # GetNewLFSPointers retrieves LFS pointers for a limited subset of the
       # commit graph. It will return all LFS pointers which are reachable by the
       # provided revision, but not reachable by any of the limiting references.
+      #
+      # Deprecated in favor of `ListLFSPointers`. `NotInAll` can be replaced with
+      # `REVISION` `--not` `--all`, while `NotInRefs` can be replaced with
+      # `REVISION` `--not` `NotInRevs...`.
       rpc :GetNewLFSPointers, Gitaly::GetNewLFSPointersRequest, stream(Gitaly::GetNewLFSPointersResponse)
       # GetAllLFSPointers retrieves all LFS pointers of the given repository.
+      #
+      # Deprecated in favor of `ListLFSPointers`, passing `--all` as revision.
       rpc :GetAllLFSPointers, Gitaly::GetAllLFSPointersRequest, stream(Gitaly::GetAllLFSPointersResponse)
+      # ListLFSPointers retrieves LFS pointers reachable from a given set of
+      # revisions by doing a graph walk. This includes both normal revisions like
+      # an object ID or branch, but also the pseudo-revisions "--all" and "--not"
+      # as documented in git-rev-parse(1). Revisions which don't directly or
+      # transitively reference any LFS pointers are ignored. It is not valid to
+      # pass revisions which do not resolve to an existing object.
+      rpc :ListLFSPointers, Gitaly::ListLFSPointersRequest, stream(Gitaly::ListLFSPointersResponse)
+      # ListAllLFSPointers retrieves all LFS pointers in the repository. In
+      # contrast to `GetAllLFSPointers`, this RPC also includes LFS pointers which
+      # are not reachable by any reference.
+      rpc :ListAllLFSPointers, Gitaly::ListAllLFSPointersRequest, stream(Gitaly::ListAllLFSPointersResponse)
     end
 
     Stub = Service.rpc_stub_class