diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2022-06-18 02:17:12 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-17 20:17:12 +0200 |
| commit | 27ba86d283f015ec6676803d7e26333f1c7dff7f (patch) | |
| tree | 677b54fb734064c466c043d17bd07905c1d1730c /routers/private | |
| parent | 719eb4a879be759c2853b50f3f30da78e2a66c82 (diff) | |
| download | gitea-27ba86d283f015ec6676803d7e26333f1c7dff7f.tar.gz gitea-27ba86d283f015ec6676803d7e26333f1c7dff7f.zip | |
move agit dependcy (#19998)
Diffstat (limited to 'routers/private')
| -rw-r--r-- | routers/private/hook_proc_receive.go | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/routers/private/hook_proc_receive.go b/routers/private/hook_proc_receive.go index 81dbc1fd18..0653f8b0d2 100644 --- a/routers/private/hook_proc_receive.go +++ b/routers/private/hook_proc_receive.go @@ -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 } |