diff options
Diffstat (limited to 'go/vendor/gitlab.com/gitlab-org/gitaly/client/upload_archive.go')
| -rw-r--r-- | go/vendor/gitlab.com/gitlab-org/gitaly/client/upload_archive.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/go/vendor/gitlab.com/gitlab-org/gitaly/client/upload_archive.go b/go/vendor/gitlab.com/gitlab-org/gitaly/client/upload_archive.go index 2459519..6b4d682 100644 --- a/go/vendor/gitlab.com/gitlab-org/gitaly/client/upload_archive.go +++ b/go/vendor/gitlab.com/gitlab-org/gitaly/client/upload_archive.go @@ -3,18 +3,20 @@ package client import ( "io" - "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/streamio" + + pb "gitlab.com/gitlab-org/gitaly-proto/go" + "golang.org/x/net/context" "google.golang.org/grpc" ) // UploadArchive proxies an SSH git-upload-archive (git archive --remote) session to Gitaly -func UploadArchive(ctx context.Context, conn *grpc.ClientConn, stdin io.Reader, stdout, stderr io.Writer, req *gitalypb.SSHUploadArchiveRequest) (int32, error) { +func UploadArchive(ctx context.Context, conn *grpc.ClientConn, stdin io.Reader, stdout, stderr io.Writer, req *pb.SSHUploadArchiveRequest) (int32, error) { ctx2, cancel := context.WithCancel(ctx) defer cancel() - ssh := gitalypb.NewSSHServiceClient(conn) + ssh := pb.NewSSHServiceClient(conn) stream, err := ssh.SSHUploadArchive(ctx2) if err != nil { return 0, err @@ -25,7 +27,7 @@ func UploadArchive(ctx context.Context, conn *grpc.ClientConn, stdin io.Reader, } inWriter := streamio.NewWriter(func(p []byte) error { - return stream.Send(&gitalypb.SSHUploadArchiveRequest{Stdin: p}) + return stream.Send(&pb.SSHUploadArchiveRequest{Stdin: p}) }) return streamHandler(func() (stdoutStderrResponse, error) { |