Merge a24f52b065
into 7be5935c55
This commit is contained in:
commit
91cb3ca22d
24
cmd/serv.go
24
cmd/serv.go
|
@ -151,13 +151,18 @@ func runServ(c *cli.Context) error {
|
|||
reponame = reponame[:len(reponame)-5]
|
||||
}
|
||||
|
||||
os.Setenv(models.EnvRepoUsername, username)
|
||||
if isWiki {
|
||||
os.Setenv(models.EnvRepoIsWiki, "true")
|
||||
} else {
|
||||
os.Setenv(models.EnvRepoIsWiki, "false")
|
||||
env := []string{}
|
||||
addEnv := func(key string, value string) {
|
||||
env = append(env, key+"="+value)
|
||||
}
|
||||
os.Setenv(models.EnvRepoName, reponame)
|
||||
|
||||
addEnv(models.EnvRepoUsername, username)
|
||||
if isWiki {
|
||||
addEnv(models.EnvRepoIsWiki, "true")
|
||||
} else {
|
||||
addEnv(models.EnvRepoIsWiki, "false")
|
||||
}
|
||||
addEnv(models.EnvRepoName, reponame)
|
||||
|
||||
repo, err := models.GetRepositoryByOwnerAndName(username, reponame)
|
||||
if err != nil {
|
||||
|
@ -255,8 +260,8 @@ func runServ(c *cli.Context) error {
|
|||
user.Name, repoPath)
|
||||
}
|
||||
|
||||
os.Setenv(models.EnvPusherName, user.Name)
|
||||
os.Setenv(models.EnvPusherID, fmt.Sprintf("%d", user.ID))
|
||||
addEnv(models.EnvPusherName, user.Name)
|
||||
addEnv(models.EnvPusherID, fmt.Sprintf("%d", user.ID))
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -316,8 +321,9 @@ func runServ(c *cli.Context) error {
|
|||
}
|
||||
}
|
||||
|
||||
os.Setenv(models.ProtectedBranchRepoID, fmt.Sprintf("%d", repo.ID))
|
||||
addEnv(models.ProtectedBranchRepoID, fmt.Sprintf("%d", repo.ID))
|
||||
|
||||
gitcmd.Env = env
|
||||
gitcmd.Dir = setting.RepoRootPath
|
||||
gitcmd.Stdout = os.Stdout
|
||||
gitcmd.Stdin = os.Stdin
|
||||
|
|
Loading…
Reference in New Issue
Block a user