diff options
| -rwxr-xr-x | bin/gitlab-shell | 2 | ||||
| -rwxr-xr-x | hooks/post-receive | 5 | ||||
| -rwxr-xr-x | hooks/pre-receive | 7 |
3 files changed, 4 insertions, 10 deletions
diff --git a/bin/gitlab-shell b/bin/gitlab-shell index f145a1b..6ef572f 100755 --- a/bin/gitlab-shell +++ b/bin/gitlab-shell @@ -6,7 +6,7 @@ unless ENV['SSH_CONNECTION'] end key_id = /key-[0-9]+/.match(ARGV.join).to_s -original_cmd = ENV['SSH_ORIGINAL_COMMAND'] +original_cmd = ENV.delete('SSH_ORIGINAL_COMMAND') require_relative '../lib/gitlab_init' diff --git a/hooks/post-receive b/hooks/post-receive index 34802e5..b7bc85e 100755 --- a/hooks/post-receive +++ b/hooks/post-receive @@ -4,12 +4,9 @@ # will be processed properly. refs = $stdin.read -key_id = ENV['GL_ID'] +key_id = ENV.delete('GL_ID') repo_path = Dir.pwd -# reset GL_ID env since we already got its value -ENV['GL_ID'] = nil - require_relative '../lib/gitlab_custom_hook' require_relative '../lib/gitlab_post_receive' diff --git a/hooks/pre-receive b/hooks/pre-receive index a4b2e32..66cb97d 100755 --- a/hooks/pre-receive +++ b/hooks/pre-receive @@ -4,8 +4,8 @@ # will be processed properly. refs = $stdin.read -key_id = ENV['GL_ID'] -protocol = ENV['GL_PROTOCOL'] +key_id = ENV.delete('GL_ID') +protocol = ENV.delete('GL_PROTOCOL') repo_path = Dir.pwd require_relative '../lib/gitlab_custom_hook' @@ -15,8 +15,5 @@ if GitlabAccess.new(repo_path, key_id, refs, protocol).exec && GitlabCustomHook.new.pre_receive(refs, repo_path) exit 0 else - # reset GL_ID env since we stop git push here - ENV['GL_ID'] = nil - exit 1 end |