Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions cmd/serv.go
Original file line number Diff line number Diff line change
Expand Up @@ -152,13 +152,18 @@ func runServ(c *cli.Context) error {
reponame = reponame[:len(reponame)-5]
}

os.Setenv(models.EnvRepoUsername, username)
env := []string{}
addEnv := func(key string, value string) {
env = append(env, key+"="+value)
}

addEnv(models.EnvRepoUsername, username)
if isWiki {
os.Setenv(models.EnvRepoIsWiki, "true")
addEnv(models.EnvRepoIsWiki, "true")
} else {
os.Setenv(models.EnvRepoIsWiki, "false")
addEnv(models.EnvRepoIsWiki, "false")
}
os.Setenv(models.EnvRepoName, reponame)
addEnv(models.EnvRepoName, reponame)

repo, err := private.GetRepositoryByOwnerAndName(username, reponame)
if err != nil {
Expand Down Expand Up @@ -259,8 +264,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))
}
}

Expand Down Expand Up @@ -319,8 +324,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
Expand Down