summaryrefslogtreecommitdiff
path: root/internal/command/uploadpack/gitalycall.go
diff options
context:
space:
mode:
authorLorenz Brun <lorenz@dolansoft.org>2021-01-18 18:36:25 +0000
committerNick Thomas <nick@gitlab.com>2021-01-18 18:36:25 +0000
commit2a410f31b633ec5a994ecf1ff39dc8ffb9c6f828 (patch)
tree6ccc8b187438d1a218ee0ec833c339fa8faa8dd1 /internal/command/uploadpack/gitalycall.go
parent0e5660917f0316a2197ffc5add7a8f01d3e428be (diff)
downloadgitlab-shell-2a410f31b633ec5a994ecf1ff39dc8ffb9c6f828.tar.gz
RFC: Simple built-in SSH server
Diffstat (limited to 'internal/command/uploadpack/gitalycall.go')
-rw-r--r--internal/command/uploadpack/gitalycall.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/internal/command/uploadpack/gitalycall.go b/internal/command/uploadpack/gitalycall.go
index ba0fef2..3ebc8b3 100644
--- a/internal/command/uploadpack/gitalycall.go
+++ b/internal/command/uploadpack/gitalycall.go
@@ -2,7 +2,6 @@ package uploadpack
import (
"context"
- "os"
"google.golang.org/grpc"
@@ -13,7 +12,7 @@ import (
"gitlab.com/gitlab-org/gitlab-shell/internal/handler"
)
-func (c *Command) performGitalyCall(response *accessverifier.Response) error {
+func (c *Command) performGitalyCall(response *accessverifier.Response, gitProtocolVersion string) error {
gc := &handler.GitalyCommand{
Config: c.Config,
ServiceName: string(commandargs.UploadPack),
@@ -24,7 +23,7 @@ func (c *Command) performGitalyCall(response *accessverifier.Response) error {
request := &pb.SSHUploadPackRequest{
Repository: &response.Gitaly.Repo,
- GitProtocol: os.Getenv(commandargs.GitProtocolEnv),
+ GitProtocol: gitProtocolVersion,
GitConfigOptions: response.GitConfigOptions,
}