diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2017-07-14 17:14:00 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2017-07-14 17:14:00 +0300 |
| commit | 2de5ed09060fb3bc6457dba237f900b1ea1b3eb0 (patch) | |
| tree | 8354d4a5bcaabd62e311dbb56496be1b0d829813 /client | |
| parent | d4744a56a5ba2932dd6e33048782a18aa33778d9 (diff) | |
Remove gitaly-proto/go/helper
Diffstat (limited to 'client')
| -rw-r--r-- | client/receive_pack.go | 10 | ||||
| -rw-r--r-- | client/upload_pack.go | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/client/receive_pack.go b/client/receive_pack.go index 39ba7ae5e..c6ab2b89c 100644 --- a/client/receive_pack.go +++ b/client/receive_pack.go @@ -3,12 +3,12 @@ package client import ( "io" - "google.golang.org/grpc" - - "golang.org/x/net/context" + "gitlab.com/gitlab-org/gitaly/streamio" pb "gitlab.com/gitlab-org/gitaly-proto/go" - pbhelper "gitlab.com/gitlab-org/gitaly-proto/go/helper" + + "golang.org/x/net/context" + "google.golang.org/grpc" ) // ReceivePack proxies an SSH git-receive-pack (git push) session to Gitaly @@ -26,7 +26,7 @@ func ReceivePack(ctx context.Context, conn *grpc.ClientConn, stdin io.Reader, st return 0, err } - inWriter := pbhelper.NewSendWriter(func(p []byte) error { + inWriter := streamio.NewWriter(func(p []byte) error { return stream.Send(&pb.SSHReceivePackRequest{Stdin: p}) }) diff --git a/client/upload_pack.go b/client/upload_pack.go index eb0fc7d92..3bdfcd907 100644 --- a/client/upload_pack.go +++ b/client/upload_pack.go @@ -3,12 +3,12 @@ package client import ( "io" - "google.golang.org/grpc" - - "golang.org/x/net/context" + "gitlab.com/gitlab-org/gitaly/streamio" pb "gitlab.com/gitlab-org/gitaly-proto/go" - pbhelper "gitlab.com/gitlab-org/gitaly-proto/go/helper" + + "golang.org/x/net/context" + "google.golang.org/grpc" ) // UploadPack proxies an SSH git-upload-pack (git fetch) session to Gitaly @@ -26,7 +26,7 @@ func UploadPack(ctx context.Context, conn *grpc.ClientConn, stdin io.Reader, std return 0, err } - inWriter := pbhelper.NewSendWriter(func(p []byte) error { + inWriter := streamio.NewWriter(func(p []byte) error { return stream.Send(&pb.SSHUploadPackRequest{Stdin: p}) }) |