diff options
Diffstat (limited to 'internal/command/uploadpack/gitalycall.go')
| -rw-r--r-- | internal/command/uploadpack/gitalycall.go | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/internal/command/uploadpack/gitalycall.go b/internal/command/uploadpack/gitalycall.go index 96dd823..2ba5f1d 100644 --- a/internal/command/uploadpack/gitalycall.go +++ b/internal/command/uploadpack/gitalycall.go @@ -15,24 +15,7 @@ import ( func (c *Command) performGitalyCall(ctx context.Context, response *accessverifier.Response) error { gc := handler.NewGitalyCommand(c.Config, string(commandargs.UploadPack), response) - if response.Gitaly.UseSidechannel { - request := &pb.SSHUploadPackWithSidechannelRequest{ - Repository: &response.Gitaly.Repo, - GitProtocol: c.Args.Env.GitProtocolVersion, - GitConfigOptions: response.GitConfigOptions, - } - - return gc.RunGitalyCommand(ctx, func(ctx context.Context, conn *grpc.ClientConn) (int32, error) { - ctx, cancel := gc.PrepareContext(ctx, request.Repository, c.Args.Env) - defer cancel() - - registry := c.Config.GitalyClient.SidechannelRegistry - rw := c.ReadWriter - return client.UploadPackWithSidechannel(ctx, conn, registry, rw.In, rw.Out, rw.ErrOut, request) - }) - } - - request := &pb.SSHUploadPackRequest{ + request := &pb.SSHUploadPackWithSidechannelRequest{ Repository: &response.Gitaly.Repo, GitProtocol: c.Args.Env.GitProtocolVersion, GitConfigOptions: response.GitConfigOptions, @@ -42,7 +25,8 @@ func (c *Command) performGitalyCall(ctx context.Context, response *accessverifie ctx, cancel := gc.PrepareContext(ctx, request.Repository, c.Args.Env) defer cancel() + registry := c.Config.GitalyClient.SidechannelRegistry rw := c.ReadWriter - return client.UploadPack(ctx, conn, rw.In, rw.Out, rw.ErrOut, request) + return client.UploadPackWithSidechannel(ctx, conn, registry, rw.In, rw.Out, rw.ErrOut, request) }) } |