aboutsummaryrefslogtreecommitdiff
path: root/cmd/serv.go
diff options
context:
space:
mode:
Diffstat (limited to 'cmd/serv.go')
-rw-r--r--cmd/serv.go11
1 files changed, 9 insertions, 2 deletions
diff --git a/cmd/serv.go b/cmd/serv.go
index 57a674e5..3bd23ff9 100644
--- a/cmd/serv.go
+++ b/cmd/serv.go
@@ -175,7 +175,7 @@ func runServ(c *cli.Context) error {
// Prohibit push to mirror repositories.
if requestMode > models.ACCESS_MODE_READ && repo.IsMirror {
- fail("mirror repository is read-only", "")
+ fail("Mirror repository is read-only", "")
}
// Allow anonymous (user is nil) clone for public repositories.
@@ -251,7 +251,14 @@ func runServ(c *cli.Context) error {
gitCmd = exec.Command(verb, repoFullName)
}
if requestMode == models.ACCESS_MODE_WRITE {
- gitCmd.Env = append(os.Environ(), http.ComposeHookEnvs(repo.RepoPath(), owner.Name, owner.Salt, repo.Name, user)...)
+ gitCmd.Env = append(os.Environ(), http.ComposeHookEnvs(http.ComposeHookEnvsOptions{
+ AuthUser: user,
+ OwnerName: owner.Name,
+ OwnerSalt: owner.Salt,
+ RepoID: repo.ID,
+ RepoName: repo.Name,
+ RepoPath: repo.RepoPath(),
+ })...)
}
gitCmd.Dir = setting.RepoRootPath
gitCmd.Stdout = os.Stdout