Stop running hooks on pr merge (#6963)

zeripath · lafriks · commit 96b412bb875f · 2019-05-17T15:41:01.000+03:00
* Stop running hooks on pr merge

* Remove SSH_ORIGINAL_COMMAND from the pushing environment
diff --git 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",
 	)
 
 }

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@ func PushingEnvironment(doer User, repo Repository) []string {`
`19`	`19`
`20`	`20`	`sig := doer.NewGitSig()`
`21`	`21`
	`22`	`+ // We should add "SSH_ORIGINAL_COMMAND=gitea-internal",`
	`23`	`+ // once we have hook and pushing infrastructure working correctly`
`22`	`24`	`return append(os.Environ(),`
`23`	`25`	`"GIT_AUTHOR_NAME="+sig.Name,`
`24`	`26`	`"GIT_AUTHOR_EMAIL="+sig.Email,`
`@@ -30,7 +32,6 @@ func PushingEnvironment(doer User, repo Repository) []string {`
`30`	`32`	`EnvPusherName+"="+doer.Name,`
`31`	`33`	`EnvPusherID+"="+fmt.Sprintf("%d", doer.ID),`
`32`	`34`	`ProtectedBranchRepoID+"="+fmt.Sprintf("%d", repo.ID),`
`33`		`- "SSH_ORIGINAL_COMMAND=gitea-internal",`
`34`	`35`	`)`
`35`	`36`
`36`	`37`	`}`