MirrorHub/forgejo
0
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-09 03:11:51 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix reopen logic for agit flow pull request (#26399)

Browse source 
the head branch is meaningless for a agit flow pull request, so should
not check it when reopen it.

related: #24231
fix #26334

Signed-off-by: a1012112796 <1012112796@qq.com>
This commit is contained in:
a1012112796 2023-08-19 17:29:34 +08:00 committed by GitHub
parent 5feef6d5c0
commit f00fdd1abd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 46 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
routers/web/repo/issue.go
View file

@ -2935,6 +2935,7 @@ func NewComment(ctx *context.Context) {
// check whether the ref of PR <refs/pulls/pr_index/head> in base repo is consistent with the head commit of head branch in the head repo // check whether the ref of PR <refs/pulls/pr_index/head> in base repo is consistent with the head commit of head branch in the head repo
// get head commit of PR // get head commit of PR
if pull.Flow == issues_model.PullRequestFlowGithub {
prHeadRef := pull.GetGitRefName() prHeadRef := pull.GetGitRefName()
if err := pull.LoadBaseRepo(ctx); err != nil { if err := pull.LoadBaseRepo(ctx); err != nil {
ctx.ServerError("Unable to load base repo", err) ctx.ServerError("Unable to load base repo", err)
@ -2983,6 +2984,7 @@ func NewComment(ctx *context.Context) {
} }
} }
} }
}
if pr != nil { if pr != nil {
ctx.Flash.Info(ctx.Tr("repo.pulls.open_unmerged_pull_exists", pr.Index)) ctx.Flash.Info(ctx.Tr("repo.pulls.open_unmerged_pull_exists", pr.Index))