aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--modules/git/repo_commit.go7
-rw-r--r--routers/repo/branch.go4
2 files changed, 7 insertions, 4 deletions
diff --git a/modules/git/repo_commit.go b/modules/git/repo_commit.go
index 0181f86bfe..52f2d27703 100644
--- a/modules/git/repo_commit.go
+++ b/modules/git/repo_commit.go
@@ -12,15 +12,20 @@ import (
"strconv"
"strings"
+ "github.com/mcuadros/go-version"
"github.com/go-git/go-git/v5/plumbing"
"github.com/go-git/go-git/v5/plumbing/object"
- "github.com/mcuadros/go-version"
)
// GetRefCommitID returns the last commit ID string of given reference (branch or tag).
func (repo *Repository) GetRefCommitID(name string) (string, error) {
ref, err := repo.gogitRepo.Reference(plumbing.ReferenceName(name), true)
if err != nil {
+ if err == plumbing.ErrReferenceNotFound {
+ return "", ErrNotExist{
+ ID: name,
+ }
+ }
return "", err
}
diff --git a/routers/repo/branch.go b/routers/repo/branch.go
index 5a020a8e85..c33242b9ba 100644
--- a/routers/repo/branch.go
+++ b/routers/repo/branch.go
@@ -16,8 +16,6 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/repofiles"
"code.gitea.io/gitea/modules/util"
-
- "github.com/go-git/go-git/v5/plumbing"
)
const (
@@ -253,7 +251,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
}