Skip to content

Handle deleted base branch in PR #10618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zeripath merged 3 commits into from
Mar 5, 2020
Merged

Handle deleted base branch in PR #10618

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
878f684
Handle deleted base branch in PR
zeripath Mar 5, 2020
5e5cace
Merge branch 'master' into fix-handle-base-branch-deletion
zeripath Mar 5, 2020
7195f3c
Merge branch 'master' into fix-handle-base-branch-deletion
zeripath Mar 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions routers/repo/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,16 @@ func PrepareViewPullInfo(ctx *context.Context, issue *models.Issue) *git.Compare
return nil
}
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 headBranchSha string
// HeadRepo may be missing
Expand Down