finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

move agit dependcy (#19998)

Browse source
This commit is contained in:
Lunny Xiao 2022-06-18 02:17:12 +08:00 • committed by GitHub
parent 719eb4a879
commit 27ba86d283
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

15
routers/private/hook_proc_receive.go
View file

@ -8,8 +8,10 @@ package private
import (
"net/http"
repo_model "code.gitea.io/gitea/models/repo"
gitea_context "code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/private"
"code.gitea.io/gitea/modules/web"
"code.gitea.io/gitea/services/agit"
@ -23,8 +25,17 @@ func HookProcReceive(ctx *gitea_context.PrivateContext) {
return
}
results := agit.ProcReceive(ctx, opts)
if ctx.Written() {
results, err := agit.ProcReceive(ctx, ctx.Repo.Repository, ctx.Repo.GitRepo, opts)
if err != nil {
if repo_model.IsErrUserDoesNotHaveAccessToRepo(err) {
ctx.Error(http.StatusBadRequest, "UserDoesNotHaveAccessToRepo", err.Error())
} else {
log.Error(err.Error())
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{
"Err": err.Error(),
})
}
return
}