From 4b5e09e4d6061e12a2a6728e5f7cfdf2f2550e58 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sat, 23 Jul 2016 18:35:16 +0800 Subject: #3181 detect situation when base branch is deleted in pull request --- routers/repo/pull.go | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'routers/repo/pull.go') diff --git a/routers/repo/pull.go b/routers/repo/pull.go index 56245a87..2c534f1e 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -235,6 +235,14 @@ func PrepareViewPullInfo(ctx *context.Context, pull *models.Issue) *git.PullRequ prInfo, err := headGitRepo.GetPullRequestInfo(models.RepoPath(repo.Owner.Name, repo.Name), pull.BaseBranch, pull.HeadBranch) if err != nil { + if strings.Contains(err.Error(), "fatal: Not a valid object name") { + ctx.Data["IsPullReuqestBroken"] = true + ctx.Data["BaseTarget"] = "deleted" + ctx.Data["NumCommits"] = 0 + ctx.Data["NumFiles"] = 0 + return nil + } + ctx.Handle(500, "GetPullRequestInfo", err) return nil } -- cgit v1.2.3