diff options
author | Stan Hu <stanhu@gmail.com> | 2018-02-06 19:17:22 +0000 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2018-02-14 14:21:53 -0600 |
commit | bf7412e48e47c31fe70046285c6109f6a2bb23c5 (patch) | |
tree | c12f9cf4e7d8ef91fbafceed78cb86c85c56cea2 | |
parent | aa9864b15646e0fbb9288db06fdf3a82238bd163 (diff) | |
download | gitlab-ce-bf7412e48e47c31fe70046285c6109f6a2bb23c5.tar.gz |
Merge branch 'dm-git-hook-popen' into 'master'
Only set cwd on the newly spawned process, instead of the current one
See merge request gitlab-org/gitlab-ce!16958
-rw-r--r-- | lib/gitlab/git/hook.rb | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/lib/gitlab/git/hook.rb b/lib/gitlab/git/hook.rb index e29a1f7afa1..24f027d8da4 100644 --- a/lib/gitlab/git/hook.rb +++ b/lib/gitlab/git/hook.rb @@ -82,14 +82,20 @@ module Gitlab end def call_update_hook(gl_id, gl_username, oldrev, newrev, ref) - Dir.chdir(repo_path) do - env = { - 'GL_ID' => gl_id, - 'GL_USERNAME' => gl_username - } - stdout, stderr, status = Open3.capture3(env, path, ref, oldrev, newrev) - [status.success?, (stderr.presence || stdout).gsub(/\R/, "<br>").html_safe] - end + env = { + 'GL_ID' => gl_id, + 'GL_USERNAME' => gl_username, + 'PWD' => repo_path + } + + options = { + chdir: repo_path + } + + args = [ref, oldrev, newrev] + + stdout, stderr, status = Open3.capture3(env, path, *args, options) + [status.success?, (stderr.presence || stdout).gsub(/\R/, "<br>").html_safe] end def retrieve_error_message(stderr, stdout) |