Read about our upcoming Code of Conduct on this issue

Commit 590a2f95 authored by Stan Hu's avatar Stan Hu
Browse files

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
......@@ -82,14 +82,20 @@ def call_receive_hook(gl_id, gl_username, oldrev, newrev, ref)
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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment