From 3fc4f3670cb748e02d786111d2029ef1e23a9640 Mon Sep 17 00:00:00 2001 From: zeripath Date: Mon, 9 Mar 2020 07:06:38 +0000 Subject: Fix panic in API pulls when headbranch does not exist (#10676) * Fix panic in API pulls when headbranch does not exist * refix other reference to plumbing.ErrReferenceNotFound Signed-off-by: Andrew Thornton --- routers/repo/branch.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'routers') diff --git a/routers/repo/branch.go b/routers/repo/branch.go index ea4f68948d..7127d50ed8 100644 --- a/routers/repo/branch.go +++ b/routers/repo/branch.go @@ -17,7 +17,6 @@ import ( "code.gitea.io/gitea/modules/repofiles" repo_module "code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/modules/util" - "gopkg.in/src-d/go-git.v4/plumbing" ) const ( @@ -253,7 +252,7 @@ func loadBranches(ctx *context.Context) []*Branch { repoIDToGitRepo[pr.BaseRepoID] = baseGitRepo } pullCommit, err := baseGitRepo.GetRefCommitID(pr.GetGitRefName()) - if err != nil && err != plumbing.ErrReferenceNotFound { + if err != nil && !git.IsErrNotExist(err) { ctx.ServerError("GetBranchCommitID", err) return nil } -- cgit v1.2.3