From 0aec2a294b4029e43f25f78fc767ee29e3d3d4bc Mon Sep 17 00:00:00 2001
From: zeripath <art27@cantab.net>
Date: Tue, 20 Oct 2020 13:52:54 +0100
Subject: [PATCH] When the git ref is unable to be found return broken pr
(#13218)
Fix #13216
Signed-off-by: Andrew Thornton <art27@cantab.net>
---
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 54da7b76b7..0ae126215a 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