diff options
| author | Alejandro Rodríguez <alejorro70@gmail.com> | 2018-10-11 21:55:16 +0300 |
|---|---|---|
| committer | Alejandro Rodríguez <alejorro70@gmail.com> | 2018-10-16 21:56:10 +0300 |
| commit | 5444d58b3303d4161659d5f90691fc7e83b84911 (patch) | |
| tree | e384dfaf8c0b10037db55f02fc75f4e7ebd8fffe /internal/rubyserver | |
| parent | 78c182dd279cc6d497ca48d63cb7fd6c0e888e95 (diff) | |
Standardize git command invocation
This propagates our git.GitEnv variables properly, plus DRYes the code
Diffstat (limited to 'internal/rubyserver')
| -rw-r--r-- | internal/rubyserver/rubyserver.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/internal/rubyserver/rubyserver.go b/internal/rubyserver/rubyserver.go index 1e5112b16..46e935ca9 100644 --- a/internal/rubyserver/rubyserver.go +++ b/internal/rubyserver/rubyserver.go @@ -16,7 +16,6 @@ import ( "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/internal/command" "gitlab.com/gitlab-org/gitaly/internal/config" - "gitlab.com/gitlab-org/gitaly/internal/git" "gitlab.com/gitlab-org/gitaly/internal/helper" "gitlab.com/gitlab-org/gitaly/internal/rubyserver/balancer" "gitlab.com/gitlab-org/gitaly/internal/supervisor" @@ -110,7 +109,7 @@ func Start() (*Server, error) { "GITALY_VERSION="+version.GetVersion(), ) - env = append(env, git.GitEnv...) + env = append(env, command.GitEnv...) if dsn := cfg.Logging.RubySentryDSN; dsn != "" { env = append(env, "SENTRY_DSN="+dsn) |