* Fix panic in API pulls when headbranch does not exist * refix other reference to plumbing.ErrReferenceNotFound Signed-off-by: Andrew Thornton <art27@cantab.net>tags/v1.13.0-dev
if git.IsErrBranchNotExist(err) { | if git.IsErrBranchNotExist(err) { | ||||
headCommitID, err := headGitRepo.GetRefCommitID(apiPullRequest.Head.Ref) | headCommitID, err := headGitRepo.GetRefCommitID(apiPullRequest.Head.Ref) | ||||
if err != nil && !git.IsErrNotExist(err) { | if err != nil && !git.IsErrNotExist(err) { | ||||
log.Error("GetCommit[%s]: %v", headBranch.Name, err) | |||||
log.Error("GetCommit[%s]: %v", pr.HeadBranch, err) | |||||
return nil | return nil | ||||
} | } | ||||
if err == nil { | if err == nil { |
func (repo *Repository) GetRefCommitID(name string) (string, error) { | func (repo *Repository) GetRefCommitID(name string) (string, error) { | ||||
ref, err := repo.gogitRepo.Reference(plumbing.ReferenceName(name), true) | ref, err := repo.gogitRepo.Reference(plumbing.ReferenceName(name), true) | ||||
if err != nil { | if err != nil { | ||||
if err == plumbing.ErrReferenceNotFound { | |||||
return "", ErrNotExist{ | |||||
ID: name, | |||||
} | |||||
} | |||||
return "", err | return "", err | ||||
} | } | ||||
"code.gitea.io/gitea/modules/repofiles" | "code.gitea.io/gitea/modules/repofiles" | ||||
repo_module "code.gitea.io/gitea/modules/repository" | repo_module "code.gitea.io/gitea/modules/repository" | ||||
"code.gitea.io/gitea/modules/util" | "code.gitea.io/gitea/modules/util" | ||||
"gopkg.in/src-d/go-git.v4/plumbing" | |||||
) | ) | ||||
const ( | const ( | ||||
repoIDToGitRepo[pr.BaseRepoID] = baseGitRepo | repoIDToGitRepo[pr.BaseRepoID] = baseGitRepo | ||||
} | } | ||||
pullCommit, err := baseGitRepo.GetRefCommitID(pr.GetGitRefName()) | pullCommit, err := baseGitRepo.GetRefCommitID(pr.GetGitRefName()) | ||||
if err != nil && err != plumbing.ErrReferenceNotFound { | |||||
if err != nil && !git.IsErrNotExist(err) { | |||||
ctx.ServerError("GetBranchCommitID", err) | ctx.ServerError("GetBranchCommitID", err) | ||||
return nil | return nil | ||||
} | } |