Implement CountCommits RPC

7 files changed, 270 insertions, 49 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c410525bc..4dd92072e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ UNRELEASED
   https://gitlab.com/gitlab-org/gitaly/merge_requests/201
 - Implement CommitService::CommitsBetween
   https://gitlab.com/gitlab-org/gitaly/merge_requests/197
+- Implement CountCommits RPC
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/203
 
 v0.14.0
 
diff --git a/internal/service/commit/count_commits.go b/internal/service/commit/count_commits.go
new file mode 100644
index 000000000..327205445
--- /dev/null
+++ b/internal/service/commit/count_commits.go
@@ -0,0 +1,58 @@
+package commit
+
+import (
+	"bufio"
+	"fmt"
+
+	"gitlab.com/gitlab-org/gitaly/internal/helper"
+
+	pb "gitlab.com/gitlab-org/gitaly-proto/go"
+
+	log "github.com/Sirupsen/logrus"
+	"golang.org/x/net/context"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
+)
+
+func (s *server) CountCommits(ctx context.Context, in *pb.CountCommitsRequest) (*pb.CountCommitsResponse, error) {
+	if err := validateCountCommitsRequest(in); err != nil {
+		return nil, grpc.Errorf(codes.InvalidArgument, "CountCommits: %v", err)
+	}
+
+	repoPath, err := helper.GetRepoPath(in.Repository)
+	if err != nil {
+		return nil, err
+	}
+
+	cmd, err := helper.GitCommandReader("--git-dir", repoPath, "rev-list", string(in.GetRevision()))
+	if err != nil {
+		return nil, grpc.Errorf(codes.Internal, "CountCommits: cmd: %v", err)
+	}
+	defer cmd.Kill()
+
+	count := 0
+	scanner := bufio.NewScanner(cmd)
+	for scanner.Scan() {
+		count++
+	}
+
+	if err := scanner.Err(); err != nil {
+		log.WithFields(log.Fields{"error": err}).Info("ignoring scanner error")
+		count = 0
+	}
+
+	if err := cmd.Wait(); err != nil {
+		log.WithFields(log.Fields{"error": err}).Info("ignoring git rev-list error")
+		count = 0
+	}
+
+	return &pb.CountCommitsResponse{Count: int32(count)}, nil
+}
+
+func validateCountCommitsRequest(in *pb.CountCommitsRequest) error {
+	if len(in.GetRevision()) == 0 {
+		return fmt.Errorf("empty Revision")
+	}
+
+	return nil
+}
diff --git a/internal/service/commit/count_commits_test.go b/internal/service/commit/count_commits_test.go
new file mode 100644
index 000000000..b20faa457
--- /dev/null
+++ b/internal/service/commit/count_commits_test.go
@@ -0,0 +1,73 @@
+package commit
+
+import (
+	"testing"
+
+	"gitlab.com/gitlab-org/gitaly/internal/testhelper"
+
+	pb "gitlab.com/gitlab-org/gitaly-proto/go"
+
+	"github.com/stretchr/testify/require"
+	"golang.org/x/net/context"
+	"google.golang.org/grpc/codes"
+)
+
+func TestSuccessfulCountCommitsRequest(t *testing.T) {
+	client := newCommitServiceClient(t)
+
+	testCases := []struct {
+		revision []byte
+		count    int32
+	}{
+		{
+			revision: []byte("1a0b36b3cdad1d2ee32457c102a8c0b7056fa863"),
+			count:    1,
+		},
+		{
+			revision: []byte("6d394385cf567f80a8fd85055db1ab4c5295806f"),
+			count:    2,
+		},
+		{
+			revision: []byte("e63f41fe459e62e1228fcef60d7189127aeba95a"),
+			count:    39,
+		},
+		{
+			revision: []byte("deadfacedeadfacedeadfacedeadfacedeadface"),
+			count:    0,
+		},
+	}
+
+	for _, testCase := range testCases {
+		t.Logf("test case: revision=%q count=%d", testCase.revision, testCase.count)
+
+		request := &pb.CountCommitsRequest{
+			Repository: testRepo,
+			Revision:   testCase.revision,
+		}
+
+		response, err := client.CountCommits(context.Background(), request)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		require.Equal(t, response.Count, testCase.count)
+	}
+}
+
+func TestFailedCountCommitsRequestDueToValidationError(t *testing.T) {
+	client := newCommitServiceClient(t)
+	revision := []byte("d42783470dc29fde2cf459eb3199ee1d7e3f3a72")
+
+	rpcRequests := []pb.CountCommitsRequest{
+		{Repository: &pb.Repository{StorageName: "fake", RelativePath: "path"}, Revision: revision}, // Repository doesn't exist
+		{Repository: nil, Revision: revision},                                                       // Repository is nil
+		{Repository: testRepo, Revision: nil},                                                       // Revision is empty
+	}
+
+	for _, rpcRequest := range rpcRequests {
+		t.Logf("test case: %v", rpcRequest)
+
+		_, err := client.CountCommits(context.Background(), &rpcRequest)
+		testhelper.AssertGrpcError(t, err, codes.InvalidArgument, "")
+	}
+}
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
index ac454c6a1..54d1a4f2a 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION
@@ -1 +1 @@
-0.12.0
+0.13.0
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/blob.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/blob.pb.go
index 14080d781..0e477af4c 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/blob.pb.go
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/blob.pb.go
@@ -25,6 +25,8 @@ It has these top-level messages:
 	TreeEntryResponse
 	CommitsBetweenRequest
 	CommitsBetweenResponse
+	CountCommitsRequest
+	CountCommitsResponse
 	CommitDiffRequest
 	CommitDiffResponse
 	CommitDeltaRequest
@@ -110,6 +112,7 @@ func (m *GetBlobRequest) GetOid() string {
 type GetBlobResponse struct {
 	Size int64  `protobuf:"varint,1,opt,name=size" json:"size,omitempty"`
 	Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"`
+	Oid  string `protobuf:"bytes,3,opt,name=oid" json:"oid,omitempty"`
 }
 
 func (m *GetBlobResponse) Reset()                    { *m = GetBlobResponse{} }
@@ -131,6 +134,13 @@ func (m *GetBlobResponse) GetData() []byte {
 	return nil
 }
 
+func (m *GetBlobResponse) GetOid() string {
+	if m != nil {
+		return m.Oid
+	}
+	return ""
+}
+
 func init() {
 	proto.RegisterType((*GetBlobRequest)(nil), "gitaly.GetBlobRequest")
 	proto.RegisterType((*GetBlobResponse)(nil), "gitaly.GetBlobResponse")
@@ -244,18 +254,18 @@ var _BlobService_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("blob.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 198 bytes of a gzipped FileDescriptorProto
+	// 204 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x4a, 0xca, 0xc9, 0x4f,
 	0xd2, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x4b, 0xcf, 0x2c, 0x49, 0xcc, 0xa9, 0x94, 0xe2,
 	0x29, 0xce, 0x48, 0x2c, 0x4a, 0x4d, 0x81, 0x88, 0x2a, 0x85, 0x71, 0xf1, 0xb9, 0xa7, 0x96, 0x38,
 	0xe5, 0xe4, 0x27, 0x05, 0xa5, 0x16, 0x96, 0xa6, 0x16, 0x97, 0x08, 0x19, 0x71, 0x71, 0x15, 0xa5,
 	0x16, 0xe4, 0x17, 0x67, 0x96, 0xe4, 0x17, 0x55, 0x4a, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x1b, 0x09,
 	0xe9, 0x41, 0x34, 0xeb, 0x05, 0xc1, 0x65, 0x82, 0x90, 0x54, 0x09, 0x09, 0x70, 0x31, 0xe7, 0x67,
-	0xa6, 0x48, 0x30, 0x29, 0x30, 0x6a, 0x70, 0x06, 0x81, 0x98, 0x4a, 0x96, 0x5c, 0xfc, 0x70, 0x73,
+	0xa6, 0x48, 0x30, 0x29, 0x30, 0x6a, 0x70, 0x06, 0x81, 0x98, 0x4a, 0xde, 0x5c, 0xfc, 0x70, 0x73,
 	0x8b, 0x0b, 0xf2, 0xf3, 0x8a, 0x53, 0x85, 0x84, 0xb8, 0x58, 0x8a, 0x33, 0xab, 0x52, 0xc1, 0x46,
-	0x32, 0x07, 0x81, 0xd9, 0x20, 0xb1, 0x94, 0xc4, 0x92, 0x44, 0xb0, 0x4e, 0x9e, 0x20, 0x30, 0xdb,
-	0xc8, 0x97, 0x8b, 0x1b, 0xa4, 0x2f, 0x38, 0xb5, 0xa8, 0x2c, 0x33, 0x39, 0x55, 0xc8, 0x8e, 0x8b,
-	0x1d, 0x6a, 0x92, 0x90, 0x18, 0xcc, 0x19, 0xa8, 0x4e, 0x96, 0x12, 0xc7, 0x10, 0x87, 0x58, 0xa9,
-	0xc4, 0x60, 0xc0, 0x98, 0xc4, 0x06, 0xf6, 0xa8, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xe0, 0xec,
-	0x47, 0x7e, 0x0c, 0x01, 0x00, 0x00,
+	0x32, 0x07, 0x81, 0xd9, 0x20, 0xb1, 0x94, 0xc4, 0x92, 0x44, 0xb0, 0x4e, 0x9e, 0x20, 0x30, 0x1b,
+	0x66, 0x18, 0x33, 0xdc, 0x30, 0x23, 0x5f, 0x2e, 0x6e, 0x90, 0x49, 0xc1, 0xa9, 0x45, 0x65, 0x99,
+	0xc9, 0xa9, 0x42, 0x76, 0x5c, 0xec, 0x50, 0xb3, 0x85, 0xc4, 0x60, 0x0e, 0x43, 0xf5, 0x84, 0x94,
+	0x38, 0x86, 0x38, 0xc4, 0x11, 0x4a, 0x0c, 0x06, 0x8c, 0x49, 0x6c, 0x60, 0xaf, 0x1b, 0x03, 0x02,
+	0x00, 0x00, 0xff, 0xff, 0xd9, 0x00, 0x89, 0x74, 0x1e, 0x01, 0x00, 0x00,
 }
diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/commit.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/commit.pb.go
index 0399593ab..74004cd9d 100644
--- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/commit.pb.go
+++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/commit.pb.go
@@ -230,6 +230,46 @@ func (m *CommitsBetweenResponse) GetCommits() []*GitCommit {
 	return nil
 }
 
+type CountCommitsRequest struct {
+	Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"`
+	Revision   []byte      `protobuf:"bytes,2,opt,name=revision,proto3" json:"revision,omitempty"`
+}
+
+func (m *CountCommitsRequest) Reset()                    { *m = CountCommitsRequest{} }
+func (m *CountCommitsRequest) String() string            { return proto.CompactTextString(m) }
+func (*CountCommitsRequest) ProtoMessage()               {}
+func (*CountCommitsRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} }
+
+func (m *CountCommitsRequest) GetRepository() *Repository {
+	if m != nil {
+		return m.Repository
+	}
+	return nil
+}
+
+func (m *CountCommitsRequest) GetRevision() []byte {
+	if m != nil {
+		return m.Revision
+	}
+	return nil
+}
+
+type CountCommitsResponse struct {
+	Count int32 `protobuf:"varint,1,opt,name=count" json:"count,omitempty"`
+}
+
+func (m *CountCommitsResponse) Reset()                    { *m = CountCommitsResponse{} }
+func (m *CountCommitsResponse) String() string            { return proto.CompactTextString(m) }
+func (*CountCommitsResponse) ProtoMessage()               {}
+func (*CountCommitsResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} }
+
+func (m *CountCommitsResponse) GetCount() int32 {
+	if m != nil {
+		return m.Count
+	}
+	return 0
+}
+
 func init() {
 	proto.RegisterType((*CommitIsAncestorRequest)(nil), "gitaly.CommitIsAncestorRequest")
 	proto.RegisterType((*CommitIsAncestorResponse)(nil), "gitaly.CommitIsAncestorResponse")
@@ -237,6 +277,8 @@ func init() {
 	proto.RegisterType((*TreeEntryResponse)(nil), "gitaly.TreeEntryResponse")
 	proto.RegisterType((*CommitsBetweenRequest)(nil), "gitaly.CommitsBetweenRequest")
 	proto.RegisterType((*CommitsBetweenResponse)(nil), "gitaly.CommitsBetweenResponse")
+	proto.RegisterType((*CountCommitsRequest)(nil), "gitaly.CountCommitsRequest")
+	proto.RegisterType((*CountCommitsResponse)(nil), "gitaly.CountCommitsResponse")
 	proto.RegisterEnum("gitaly.TreeEntryResponse_ObjectType", TreeEntryResponse_ObjectType_name, TreeEntryResponse_ObjectType_value)
 }
 
@@ -254,6 +296,7 @@ type CommitServiceClient interface {
 	CommitIsAncestor(ctx context.Context, in *CommitIsAncestorRequest, opts ...grpc.CallOption) (*CommitIsAncestorResponse, error)
 	TreeEntry(ctx context.Context, in *TreeEntryRequest, opts ...grpc.CallOption) (CommitService_TreeEntryClient, error)
 	CommitsBetween(ctx context.Context, in *CommitsBetweenRequest, opts ...grpc.CallOption) (CommitService_CommitsBetweenClient, error)
+	CountCommits(ctx context.Context, in *CountCommitsRequest, opts ...grpc.CallOption) (*CountCommitsResponse, error)
 }
 
 type commitServiceClient struct {
@@ -337,12 +380,22 @@ func (x *commitServiceCommitsBetweenClient) Recv() (*CommitsBetweenResponse, err
 	return m, nil
 }
 
+func (c *commitServiceClient) CountCommits(ctx context.Context, in *CountCommitsRequest, opts ...grpc.CallOption) (*CountCommitsResponse, error) {
+	out := new(CountCommitsResponse)
+	err := grpc.Invoke(ctx, "/gitaly.CommitService/CountCommits", in, out, c.cc, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // Server API for CommitService service
 
 type CommitServiceServer interface {
 	CommitIsAncestor(context.Context, *CommitIsAncestorRequest) (*CommitIsAncestorResponse, error)
 	TreeEntry(*TreeEntryRequest, CommitService_TreeEntryServer) error
 	CommitsBetween(*CommitsBetweenRequest, CommitService_CommitsBetweenServer) error
+	CountCommits(context.Context, *CountCommitsRequest) (*CountCommitsResponse, error)
 }
 
 func RegisterCommitServiceServer(s *grpc.Server, srv CommitServiceServer) {
@@ -409,6 +462,24 @@ func (x *commitServiceCommitsBetweenServer) Send(m *CommitsBetweenResponse) erro
 	return x.ServerStream.SendMsg(m)
 }
 
+func _CommitService_CountCommits_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CountCommitsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(CommitServiceServer).CountCommits(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/gitaly.CommitService/CountCommits",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(CommitServiceServer).CountCommits(ctx, req.(*CountCommitsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 var _CommitService_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "gitaly.CommitService",
 	HandlerType: (*CommitServiceServer)(nil),
@@ -417,6 +488,10 @@ var _CommitService_serviceDesc = grpc.ServiceDesc{
 			MethodName: "CommitIsAncestor",
 			Handler:    _CommitService_CommitIsAncestor_Handler,
 		},
+		{
+			MethodName: "CountCommits",
+			Handler:    _CommitService_CountCommits_Handler,
+		},
 	},
 	Streams: []grpc.StreamDesc{
 		{
@@ -436,36 +511,39 @@ var _CommitService_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("commit.proto", fileDescriptor1) }
 
 var fileDescriptor1 = []byte{
-	// 487 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x93, 0x5b, 0x6b, 0xdb, 0x30,
-	0x14, 0xc7, 0xab, 0x38, 0xb7, 0x9e, 0x64, 0xc1, 0x3d, 0xec, 0xe2, 0x06, 0xb6, 0x1a, 0xb3, 0x87,
-	0xc0, 0x20, 0x14, 0x8f, 0xc1, 0x5e, 0x9b, 0x2e, 0x94, 0xc0, 0x4a, 0x40, 0x35, 0xec, 0x71, 0xb8,
-	0xb6, 0xb6, 0x68, 0xc4, 0x96, 0x27, 0xa9, 0x19, 0xde, 0xeb, 0x9e, 0x06, 0xfb, 0x74, 0xfb, 0x44,
-	0xc3, 0x92, 0x9d, 0xb6, 0xe9, 0xf2, 0xd4, 0xb7, 0xff, 0xb9, 0xe8, 0x9c, 0x9f, 0xce, 0x91, 0x60,
-	0x98, 0x88, 0x2c, 0xe3, 0x7a, 0x5a, 0x48, 0xa1, 0x05, 0x76, 0xbf, 0x72, 0x1d, 0xaf, 0xcb, 0xf1,
-	0x50, 0xad, 0x62, 0xc9, 0x52, 0xeb, 0x0d, 0x7e, 0x13, 0x78, 0x71, 0x6e, 0xd2, 0x16, 0xea, 0x2c,
-	0x4f, 0x98, 0xd2, 0x42, 0x52, 0xf6, 0xfd, 0x86, 0x29, 0x8d, 0x21, 0x80, 0x64, 0x85, 0x50, 0x5c,
-	0x0b, 0x59, 0x7a, 0xc4, 0x27, 0x93, 0x41, 0x88, 0x53, 0x5b, 0x66, 0x4a, 0xb7, 0x11, 0x7a, 0x27,
-	0x0b, 0x4f, 0x60, 0x10, 0xd7, 0x65, 0x3e, 0xf3, 0xd4, 0x6b, 0xf9, 0x64, 0x72, 0x48, 0xa1, 0x71,
-	0x2d, 0x52, 0x3c, 0x86, 0x7e, 0xb2, 0xe2, 0xeb, 0xb4, 0x8a, 0x3a, 0x26, 0xda, 0x33, 0xf6, 0x22,
-	0x0d, 0x4e, 0xc1, 0x7b, 0x88, 0xa2, 0x0a, 0x91, 0x2b, 0x86, 0x4f, 0xa1, 0xb3, 0x89, 0xd7, 0x37,
-	0xcc, 0x60, 0xf4, 0xa9, 0x35, 0x82, 0x3f, 0x04, 0xdc, 0x48, 0x32, 0x36, 0xcf, 0xb5, 0x2c, 0x1f,
-	0x83, 0x3d, 0x86, 0xbe, 0x64, 0x1b, 0xae, 0xb8, 0xc8, 0x0d, 0xf3, 0x90, 0x6e, 0x6d, 0x44, 0x68,
-	0x17, 0xb1, 0x5e, 0x19, 0xda, 0x21, 0x35, 0xba, 0xc2, 0x59, 0xf3, 0x8c, 0x6b, 0xaf, 0xed, 0x93,
-	0x89, 0x43, 0xad, 0x11, 0xfc, 0x25, 0x70, 0x74, 0x07, 0xa7, 0x46, 0x7f, 0x0f, 0x6d, 0x5d, 0x16,
-	0x96, 0x7c, 0x14, 0xbe, 0x6e, 0x48, 0x1e, 0x24, 0x4e, 0x97, 0xd7, 0xdf, 0x58, 0xa2, 0xa3, 0xb2,
-	0x60, 0xd4, 0x9c, 0x40, 0x17, 0x1c, 0xb1, 0x1d, 0x62, 0x25, 0x2b, 0x16, 0xc5, 0x7f, 0x32, 0xc3,
-	0xe2, 0x50, 0xa3, 0x2b, 0x5f, 0x26, 0x52, 0x66, 0x50, 0x3a, 0xd4, 0xe8, 0xca, 0x97, 0xc6, 0x3a,
-	0xf6, 0x3a, 0x96, 0xb9, 0xd2, 0xc1, 0x3b, 0x80, 0xdb, 0x0e, 0x08, 0xd0, 0x3d, 0x5f, 0x5e, 0x5e,
-	0x2e, 0x22, 0xf7, 0x00, 0xfb, 0xd0, 0x9e, 0x7d, 0x5c, 0xce, 0x5c, 0x52, 0xa9, 0x88, 0xce, 0xe7,
-	0x6e, 0x0b, 0x7b, 0xe0, 0x44, 0x67, 0x17, 0xae, 0x13, 0x08, 0x78, 0x66, 0xb7, 0xa2, 0x66, 0x4c,
-	0xff, 0x60, 0x2c, 0x7f, 0xcc, 0x9c, 0x11, 0xda, 0x5f, 0xa4, 0xc8, 0xea, 0x19, 0x1b, 0x8d, 0x23,
-	0x68, 0x69, 0x51, 0x4f, 0xb7, 0xa5, 0x45, 0x30, 0x87, 0xe7, 0xbb, 0x0d, 0xeb, 0x49, 0xbe, 0x81,
-	0x9e, 0x7d, 0xd2, 0xca, 0x23, 0xbe, 0x33, 0x19, 0x84, 0x47, 0x4d, 0xbb, 0x0b, 0xae, 0xed, 0x19,
-	0xda, 0x64, 0x84, 0xbf, 0x5a, 0xf0, 0xc4, 0xfa, 0xae, 0x98, 0xdc, 0xf0, 0x84, 0xe1, 0x27, 0x70,
-	0x77, 0xdf, 0x17, 0x9e, 0x34, 0x15, 0xf6, 0x7c, 0x82, 0xb1, 0xbf, 0x3f, 0xc1, 0x52, 0x05, 0x07,
-	0xf8, 0x01, 0x0e, 0xb7, 0xdb, 0x44, 0xef, 0x3f, 0x0b, 0xb6, 0xa5, 0x8e, 0xf7, 0xae, 0x3e, 0x38,
-	0x38, 0x25, 0x78, 0x05, 0xa3, 0xfb, 0xf7, 0xc6, 0x97, 0xf7, 0x7b, 0xef, 0x2c, 0x60, 0xfc, 0x6a,
-	0x5f, 0xf8, 0xb6, 0xe8, 0x75, 0xd7, 0x7c, 0xf3, 0xb7, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x6f,
-	0x0a, 0x91, 0xcb, 0x0c, 0x04, 0x00, 0x00,
+	// 532 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0x5b, 0x6b, 0x13, 0x41,
+	0x14, 0xc7, 0xbb, 0xd9, 0xdc, 0x7a, 0x12, 0xc3, 0xf6, 0x58, 0x75, 0x1b, 0x2f, 0x0d, 0x83, 0x0f,
+	0x01, 0x25, 0x94, 0x88, 0xe0, 0x6b, 0x13, 0x43, 0x09, 0x5a, 0x02, 0xd3, 0x80, 0x8f, 0xb2, 0xdd,
+	0x1d, 0xcd, 0x48, 0xb2, 0xb3, 0xce, 0x4c, 0x22, 0xf1, 0x1b, 0x08, 0x7e, 0x38, 0xf1, 0x13, 0xc9,
+	0xce, 0xec, 0xe6, 0xda, 0x3c, 0x15, 0xdf, 0xce, 0x6d, 0xce, 0xf9, 0x71, 0xce, 0x7f, 0x17, 0xea,
+	0xa1, 0x98, 0xcd, 0xb8, 0xee, 0x24, 0x52, 0x68, 0x81, 0xe5, 0xaf, 0x5c, 0x07, 0xd3, 0x65, 0xb3,
+	0xae, 0x26, 0x81, 0x64, 0x91, 0x8d, 0x92, 0x5f, 0x0e, 0x3c, 0xe9, 0x9b, 0xb2, 0xa1, 0xba, 0x8c,
+	0x43, 0xa6, 0xb4, 0x90, 0x94, 0x7d, 0x9f, 0x33, 0xa5, 0xb1, 0x0b, 0x20, 0x59, 0x22, 0x14, 0xd7,
+	0x42, 0x2e, 0x7d, 0xa7, 0xe5, 0xb4, 0x6b, 0x5d, 0xec, 0xd8, 0x36, 0x1d, 0xba, 0xca, 0xd0, 0x8d,
+	0x2a, 0x3c, 0x87, 0x5a, 0x90, 0xb5, 0xf9, 0xcc, 0x23, 0xbf, 0xd0, 0x72, 0xda, 0xc7, 0x14, 0xf2,
+	0xd0, 0x30, 0xc2, 0x33, 0xa8, 0x86, 0x13, 0x3e, 0x8d, 0xd2, 0xac, 0x6b, 0xb2, 0x15, 0xe3, 0x0f,
+	0x23, 0x72, 0x01, 0xfe, 0x3e, 0x8a, 0x4a, 0x44, 0xac, 0x18, 0x9e, 0x42, 0x69, 0x11, 0x4c, 0xe7,
+	0xcc, 0x60, 0x54, 0xa9, 0x75, 0xc8, 0x6f, 0x07, 0xbc, 0xb1, 0x64, 0x6c, 0x10, 0x6b, 0xb9, 0xbc,
+	0x0f, 0x76, 0x13, 0xaa, 0x92, 0x2d, 0xb8, 0xe2, 0x22, 0x36, 0xcc, 0x75, 0xba, 0xf2, 0x11, 0xa1,
+	0x98, 0x04, 0x7a, 0x62, 0x68, 0xeb, 0xd4, 0xd8, 0x29, 0xce, 0x94, 0xcf, 0xb8, 0xf6, 0x8b, 0x2d,
+	0xa7, 0xed, 0x52, 0xeb, 0x90, 0xbf, 0x0e, 0x9c, 0x6c, 0xe0, 0x64, 0xe8, 0xef, 0xa0, 0xa8, 0x97,
+	0x89, 0x25, 0x6f, 0x74, 0x5f, 0xe6, 0x24, 0x7b, 0x85, 0x9d, 0xd1, 0xed, 0x37, 0x16, 0xea, 0xf1,
+	0x32, 0x61, 0xd4, 0xbc, 0x40, 0x0f, 0x5c, 0xb1, 0x5a, 0x62, 0x6a, 0xa6, 0x2c, 0x8a, 0xff, 0x64,
+	0x86, 0xc5, 0xa5, 0xc6, 0x4e, 0x63, 0x33, 0x11, 0x31, 0x83, 0x52, 0xa2, 0xc6, 0x4e, 0x63, 0x51,
+	0xa0, 0x03, 0xbf, 0x64, 0x99, 0x53, 0x9b, 0xbc, 0x05, 0x58, 0x4f, 0x40, 0x80, 0x72, 0x7f, 0x74,
+	0x7d, 0x3d, 0x1c, 0x7b, 0x47, 0x58, 0x85, 0x62, 0xef, 0xe3, 0xa8, 0xe7, 0x39, 0xa9, 0x35, 0xa6,
+	0x83, 0x81, 0x57, 0xc0, 0x0a, 0xb8, 0xe3, 0xcb, 0x2b, 0xcf, 0x25, 0x02, 0x1e, 0xd9, 0xab, 0xa8,
+	0x1e, 0xd3, 0x3f, 0x18, 0x8b, 0xef, 0xb3, 0x67, 0x84, 0xe2, 0x17, 0x29, 0x66, 0xd9, 0x8e, 0x8d,
+	0x8d, 0x0d, 0x28, 0x68, 0x91, 0x6d, 0xb7, 0xa0, 0x05, 0x19, 0xc0, 0xe3, 0xdd, 0x81, 0xd9, 0x26,
+	0x5f, 0x41, 0xc5, 0x4a, 0x5a, 0xf9, 0x4e, 0xcb, 0x6d, 0xd7, 0xba, 0x27, 0xf9, 0xb8, 0x2b, 0xae,
+	0xed, 0x1b, 0x9a, 0x57, 0x10, 0x06, 0x0f, 0xfb, 0x62, 0x1e, 0x67, 0x71, 0xf5, 0x9f, 0xd4, 0x41,
+	0x5e, 0xc3, 0xe9, 0xf6, 0x98, 0xb5, 0x60, 0xc3, 0x34, 0x6e, 0x46, 0x94, 0xa8, 0x75, 0xba, 0x7f,
+	0x0a, 0xf0, 0xc0, 0x56, 0xde, 0x30, 0xb9, 0xe0, 0x21, 0xc3, 0x4f, 0xe0, 0xed, 0x8a, 0x1e, 0xcf,
+	0x73, 0x9e, 0x03, 0x5f, 0x66, 0xb3, 0x75, 0xb8, 0xc0, 0x8e, 0x27, 0x47, 0xf8, 0x1e, 0x8e, 0x57,
+	0x12, 0x43, 0xff, 0x0e, 0xd5, 0xd9, 0x56, 0x67, 0x07, 0xf5, 0x48, 0x8e, 0x2e, 0x1c, 0xbc, 0x81,
+	0xc6, 0xf6, 0x31, 0xf0, 0xf9, 0xf6, 0xec, 0x1d, 0x55, 0x34, 0x5f, 0x1c, 0x4a, 0x6f, 0x34, 0xfd,
+	0x00, 0xf5, 0xcd, 0x9d, 0xe1, 0xd3, 0xf5, 0x9b, 0xbd, 0x83, 0x35, 0x9f, 0xdd, 0x9d, 0xcc, 0xdb,
+	0xdd, 0x96, 0xcd, 0x8f, 0xec, 0xcd, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x64, 0xef, 0x2c, 0x85,
+	0xee, 0x04, 0x00, 0x00,
 }
diff --git a/vendor/vendor.json b/vendor/vendor.json
index fb63c968d..e155923ba 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -191,20 +191,20 @@
 			"revisionTime": "2017-01-30T11:31:45Z"
 		},
 		{
-			"checksumSHA1": "P/ZK+KQcyfxAAlpOQqcnutYxOIc=",
+			"checksumSHA1": "NaSZlvcNDt6xjUlowFsxvs78AwU=",
 			"path": "gitlab.com/gitlab-org/gitaly-proto/go",
-			"revision": "9d7cce7a7f2e71a031a101073296d21482c801ea",
-			"revisionTime": "2017-07-04T15:20:55Z",
-			"version": "v0.12.0",
-			"versionExact": "v0.12.0"
+			"revision": "c4481d2d5cda107e28c68c9bf6c373e413cf356e",
+			"revisionTime": "2017-07-06T13:31:57Z",
+			"version": "v0.13.0",
+			"versionExact": "v0.13.0"
 		},
 		{
 			"checksumSHA1": "GkeSZfXVbtAkBZOrswot19GJZqQ=",
 			"path": "gitlab.com/gitlab-org/gitaly-proto/go/helper",
-			"revision": "9d7cce7a7f2e71a031a101073296d21482c801ea",
-			"revisionTime": "2017-07-04T15:20:55Z",
-			"version": "v0.12.0",
-			"versionExact": "v0.12.0"
+			"revision": "c4481d2d5cda107e28c68c9bf6c373e413cf356e",
+			"revisionTime": "2017-07-06T13:31:57Z",
+			"version": "v0.13.0",
+			"versionExact": "v0.13.0"
 		},
 		{
 			"checksumSHA1": "Y+HGqEkYM15ir+J93MEaHdyFy0c=",