From 96b412bb875f534e37b9af3d9e71842a2dadb6e0 Mon Sep 17 00:00:00 2001 From: zeripath Date: Fri, 17 May 2019 13:41:01 +0100 Subject: [PATCH] Stop running hooks on pr merge (#6963) * Stop running hooks on pr merge * Remove SSH_ORIGINAL_COMMAND from the pushing environment --- models/helper_environment.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/models/helper_environment.go b/models/helper_environment.go index 283584cc52..737a9a68c3 100644 --- a/models/helper_environment.go +++ b/models/helper_environment.go @@ -19,6 +19,8 @@ func PushingEnvironment(doer *User, repo *Repository) []string { sig := doer.NewGitSig() + // We should add "SSH_ORIGINAL_COMMAND=gitea-internal", + // once we have hook and pushing infrastructure working correctly return append(os.Environ(), "GIT_AUTHOR_NAME="+sig.Name, "GIT_AUTHOR_EMAIL="+sig.Email, @@ -30,7 +32,6 @@ func PushingEnvironment(doer *User, repo *Repository) []string { EnvPusherName+"="+doer.Name, EnvPusherID+"="+fmt.Sprintf("%d", doer.ID), ProtectedBranchRepoID+"="+fmt.Sprintf("%d", repo.ID), - "SSH_ORIGINAL_COMMAND=gitea-internal", ) }