From 9a6658f511aa3c4b84b2e10f7af6b93dda17b314 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Wed, 15 May 2019 22:11:06 +0100 Subject: [PATCH 1/2] Stop running hooks on pr merge --- models/pull.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/models/pull.go b/models/pull.go index fe18765fc0c78..76a5f8906fe0d 100644 --- a/models/pull.go +++ b/models/pull.go @@ -556,6 +556,8 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle } env := PushingEnvironment(doer, pr.BaseRepo) + // FIXME: #6946 requires protected branches to be ignored + env = env[:len(env)-1] // Push back to upstream. if err := git.NewCommand("push", baseGitRepo.Path, pr.BaseBranch).RunInDirTimeoutEnvPipeline(env, -1, tmpBasePath, nil, &errbuf); err != nil { From 8f708b1854f591401deff44cf33caa5d0410c8b4 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Fri, 17 May 2019 10:22:23 +0100 Subject: [PATCH 2/2] Remove SSH_ORIGINAL_COMMAND from the pushing environment --- models/helper_environment.go | 3 ++- models/pull.go | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/models/helper_environment.go b/models/helper_environment.go index 283584cc5238d..737a9a68c3a36 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", ) } diff --git a/models/pull.go b/models/pull.go index 76a5f8906fe0d..fe18765fc0c78 100644 --- a/models/pull.go +++ b/models/pull.go @@ -556,8 +556,6 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle } env := PushingEnvironment(doer, pr.BaseRepo) - // FIXME: #6946 requires protected branches to be ignored - env = env[:len(env)-1] // Push back to upstream. if err := git.NewCommand("push", baseGitRepo.Path, pr.BaseBranch).RunInDirTimeoutEnvPipeline(env, -1, tmpBasePath, nil, &errbuf); err != nil {