summaryrefslogtreecommitdiff
path: root/scripts/security-harness
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-06-16 18:25:58 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-06-16 18:25:58 +0000
commita5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch)
treefb69158581673816a8cd895f9d352dcb3c678b1e /scripts/security-harness
parentd16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff)
downloadgitlab-ce-a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4.tar.gz
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'scripts/security-harness')
-rwxr-xr-xscripts/security-harness3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/security-harness b/scripts/security-harness
index 0c1ade06587..ec062fc17cc 100755
--- a/scripts/security-harness
+++ b/scripts/security-harness
@@ -4,6 +4,7 @@
require 'digest'
require 'fileutils'
+require 'open3'
if ENV['NO_COLOR']
SHELL_RED = ''
@@ -18,7 +19,7 @@ else
end
LEFTHOOK_GLOBAL_CONFIG_PATH = File.expand_path("../lefthook.yml", __dir__)
-HOOK_PATH = File.expand_path("../.git/hooks/pre-push", __dir__)
+HOOK_PATH = Open3.capture3("git rev-parse --path-format=absolute --git-path hooks/pre-push")[0].strip
HOOK_DATA = <<~HOOK
#!/usr/bin/env bash