From d082faa52d7aed2f7e785f33f745950903ac3b16 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Tue, 20 Oct 2020 12:31:53 +0100 Subject: [PATCH] When the git ref is unable to be found return broken pr Fix #13216 Signed-off-by: Andrew Thornton --- routers/repo/pull.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/repo/pull.go b/routers/repo/pull.go index 54da7b76b7edf..0ae126215ab4c 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -311,7 +311,7 @@ func PrepareMergedViewPullInfo(ctx *context.Context, issue *models.Issue) *git.C compareInfo, err := ctx.Repo.GitRepo.GetCompareInfo(ctx.Repo.Repository.RepoPath(), pull.MergeBase, pull.GetGitRefName()) if err != nil { - if strings.Contains(err.Error(), "fatal: Not a valid object name") { + if strings.Contains(err.Error(), "fatal: Not a valid object name") || strings.Contains(err.Error(), "unknown revision or path not in the working tree") { ctx.Data["IsPullRequestBroken"] = true ctx.Data["BaseTarget"] = pull.BaseBranch ctx.Data["NumCommits"] = 0