diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-10-01 11:48:08 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-10-01 11:48:08 +0200 |
| commit | 33c8d4879f34402876980d40716a64ae6f888347 (patch) | |
| tree | 55d7a5a844c7e3cec5ff6ad0203e5383b5e0204a /lib/gitlab_shell.rb | |
| parent | 979a6df4755a114e38cd1825be40cb07225f1fb4 (diff) | |
| parent | 57bc57298c64f40a0a851e474b3e6de91a551ec5 (diff) | |
| download | gitlab-shell-33c8d4879f34402876980d40716a64ae6f888347.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-shell into no-init-on-gcryptsetup
Diffstat (limited to 'lib/gitlab_shell.rb')
| -rw-r--r-- | lib/gitlab_shell.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb index cbfe468..4bc1cd7 100644 --- a/lib/gitlab_shell.rb +++ b/lib/gitlab_shell.rb @@ -111,6 +111,8 @@ class GitlabShell $logger.info "gitlab-shell: executing git-annex command <#{parsed_args.join(' ')}> for #{log_username}." exec_cmd(*parsed_args) + elsif @git_cmd == 'git-lfs-authenticate' + exec_cmd(@origin_cmd) else $logger.info "gitlab-shell: executing git command <#{@git_cmd} #{repo_full_path}> for #{log_username}." exec_cmd(@git_cmd, repo_full_path) @@ -122,6 +124,7 @@ class GitlabShell env = { 'PATH' => ENV['PATH'], 'LD_LIBRARY_PATH' => ENV['LD_LIBRARY_PATH'], + 'LANG' => ENV['LANG'], 'GL_ID' => @key_id } |