lavender-legacy
/
gitea
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Handle deleted base branch in PR (#10618) 

Signed-off-by: Andrew Thornton <art27@cantab.net>
release/v1.15
zeripath 2020-03-05 18:51:21 +00:00 committed by GitHub
parent ae452d024e
commit 35027305d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
routers/repo/pull.go
View File

@ -356,6 +356,16 @@ func PrepareViewPullInfo(ctx *context.Context, issue *models.Issue) *git.Compare
return nil return nil
} }
defer baseGitRepo.Close() defer baseGitRepo.Close()
if !baseGitRepo.IsBranchExist(pull.BaseBranch) {
ctx.Data["IsPullRequestBroken"] = true
ctx.Data["BaseTarget"] = pull.BaseBranch
ctx.Data["HeadTarget"] = pull.HeadBranch
ctx.Data["NumCommits"] = 0
ctx.Data["NumFiles"] = 0
return nil
}
var headBranchExist bool var headBranchExist bool
var headBranchSha string var headBranchSha string
// HeadRepo may be missing // HeadRepo may be missing