Fix bug create/edit wiki pages when code master branch protected (#7580) (#7623)

* fix bug create/edit wiki pages when code master branch protected

* improve FullPushingEnvironment function
This commit is contained in:
Lunny Xiao 2019-07-26 09:22:20 +08:00 committed by Lauris BH
parent b7e41f7b8f
commit 4c69e158e5
3 changed files with 18 additions and 6 deletions

View file

@ -12,13 +12,13 @@ import (
// PushingEnvironment returns an os environment to allow hooks to work on push
func PushingEnvironment(doer *User, repo *Repository) []string {
return FullPushingEnvironment(doer, doer, repo, 0)
return FullPushingEnvironment(doer, doer, repo, repo.Name, 0)
}
// FullPushingEnvironment returns an os environment to allow hooks to work on push
func FullPushingEnvironment(author, committer *User, repo *Repository, prID int64) []string {
func FullPushingEnvironment(author, committer *User, repo *Repository, repoName string, prID int64) []string {
isWiki := "false"
if strings.HasSuffix(repo.Name, ".wiki") {
if strings.HasSuffix(repoName, ".wiki") {
isWiki = "true"
}
@ -32,7 +32,7 @@ func FullPushingEnvironment(author, committer *User, repo *Repository, prID int6
"GIT_AUTHOR_EMAIL="+authorSig.Email,
"GIT_COMMITTER_NAME="+committerSig.Name,
"GIT_COMMITTER_EMAIL="+committerSig.Email,
EnvRepoName+"="+repo.Name,
EnvRepoName+"="+repoName,
EnvRepoUsername+"="+repo.MustOwnerName(),
EnvRepoIsWiki+"="+isWiki,
EnvPusherName+"="+committer.Name,