mirror/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-14 22:16:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix missing message in git hook when pull requests disabled on fork (#22625) (#22658)

Browse source 
Backport #22625

Co-authored-by: Brecht Van Lommel <brecht@blender.org>
This commit is contained in:
John Olheiser 2023-01-29 18:55:45 -06:00 committed by GitHub
parent a9ba7379fe
commit e6d6bce1f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
routers/private/hook_post_receive.go
View file

@ -174,13 +174,6 @@ func HookPostReceive(ctx *gitea_context.PrivateContext) {
return return
} }
if !repo.AllowsPulls() {
// We can stop there's no need to go any further
ctx.JSON(http.StatusOK, private.HookPostReceiveResult{
RepoWasEmpty: wasEmpty,
})
return
}
baseRepo = repo baseRepo = repo
if repo.IsFork { if repo.IsFork {
@ -192,10 +185,20 @@ func HookPostReceive(ctx *gitea_context.PrivateContext) {
}) })
return return
} }
if repo.BaseRepo.AllowsPulls() {
baseRepo = repo.BaseRepo baseRepo = repo.BaseRepo
} }
} }
if !baseRepo.AllowsPulls() {
// We can stop there's no need to go any further
ctx.JSON(http.StatusOK, private.HookPostReceiveResult{
RepoWasEmpty: wasEmpty,
})
return
}
}
// If our branch is the default branch of an unforked repo - there's no PR to create or refer to // If our branch is the default branch of an unforked repo - there's no PR to create or refer to
if !repo.IsFork && branch == baseRepo.DefaultBranch { if !repo.IsFork && branch == baseRepo.DefaultBranch {
results = append(results, private.HookPostReceiveBranchResult{}) results = append(results, private.HookPostReceiveBranchResult{})
@ -218,14 +221,14 @@ func HookPostReceive(ctx *gitea_context.PrivateContext) {
branch = fmt.Sprintf("%s:%s", repo.OwnerName, branch) branch = fmt.Sprintf("%s:%s", repo.OwnerName, branch)
} }
results = append(results, private.HookPostReceiveBranchResult{ results = append(results, private.HookPostReceiveBranchResult{
Message: setting.Git.PullRequestPushMessage && repo.AllowsPulls(), Message: setting.Git.PullRequestPushMessage && baseRepo.AllowsPulls(),
Create: true, Create: true,
Branch: branch, Branch: branch,
URL: fmt.Sprintf("%s/compare/%s...%s", baseRepo.HTMLURL(), util.PathEscapeSegments(baseRepo.DefaultBranch), util.PathEscapeSegments(branch)), URL: fmt.Sprintf("%s/compare/%s...%s", baseRepo.HTMLURL(), util.PathEscapeSegments(baseRepo.DefaultBranch), util.PathEscapeSegments(branch)),
}) })
} else { } else {
results = append(results, private.HookPostReceiveBranchResult{ results = append(results, private.HookPostReceiveBranchResult{
Message: setting.Git.PullRequestPushMessage && repo.AllowsPulls(), Message: setting.Git.PullRequestPushMessage && baseRepo.AllowsPulls(),
Create: false, Create: false,
Branch: branch, Branch: branch,
URL: fmt.Sprintf("%s/pulls/%d", baseRepo.HTMLURL(), pr.Index), URL: fmt.Sprintf("%s/pulls/%d", baseRepo.HTMLURL(), pr.Index),