diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-11-14 02:16:37 +0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-11-14 02:39:11 +0300 |
| commit | 598511b311e8e15a2f382740495c4532fac8217d (patch) | |
| tree | 12fc5bdb3231f3dfb6358cfec33f2dbc175e5dea | |
| parent | 7f0047b8f9af148ca3b15a8c3e8cc44ae159991d (diff) | |
Support GL_CONFIG_OPTIONS environment variable in git upload-packda-support-git-config-upload-pack
| -rw-r--r-- | cmd/gitaly-ssh/upload_pack.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cmd/gitaly-ssh/upload_pack.go b/cmd/gitaly-ssh/upload_pack.go index c6fbf4b89..ea005a4e5 100644 --- a/cmd/gitaly-ssh/upload_pack.go +++ b/cmd/gitaly-ssh/upload_pack.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "os" + "strings" "github.com/golang/protobuf/jsonpb" "gitlab.com/gitlab-org/gitaly/client" @@ -17,6 +18,12 @@ func uploadPack(ctx context.Context, conn *grpc.ClientConn, req string) (int32, return 0, fmt.Errorf("json unmarshal: %v", err) } + gitConfig := os.Getenv("GL_CONFIG_OPTIONS") + + if len(gitConfig) > 0 { + request.GitConfigOptions = append(request.GitConfigOptions, strings.Split(gitConfig, " ")...) + } + ctx, cancel := context.WithCancel(ctx) defer cancel() |