aboutsummaryrefslogtreecommitdiffstats
path: root/modules/git/repo_tag.go
diff options
context:
space:
mode:
authorLunny Xiao <xiaolunwen@gmail.com>2023-12-19 15:20:47 +0800
committerGitHub <noreply@github.com>2023-12-19 07:20:47 +0000
commit4eb2a29910779ac6005a5d67f31067a1132c5297 (patch)
tree6be901075430e94785bc37ac4ec67392a17ed868 /modules/git/repo_tag.go
parent128eac9e0b03ee9c1e45dbd49da8e4726ca569f2 (diff)
downloadgitea-4eb2a29910779ac6005a5d67f31067a1132c5297.tar.gz
gitea-4eb2a29910779ac6005a5d67f31067a1132c5297.zip
Improve ObjectFormat interface (#28496)
The 4 functions are duplicated, especially as interface methods. I think we just need to keep `MustID` the only one and remove other 3. ``` MustID(b []byte) ObjectID MustIDFromString(s string) ObjectID NewID(b []byte) (ObjectID, error) NewIDFromString(s string) (ObjectID, error) ``` Introduced the new interfrace method `ComputeHash` which will replace the interface `HasherInterface`. Now we don't need to keep two interfaces. Reintroduced `git.NewIDFromString` and `git.MustIDFromString`. The new function will detect the hash length to decide which objectformat of it. If it's 40, then it's SHA1. If it's 64, then it's SHA256. This will be right if the commitID is a full one. So the parameter should be always a full commit id. @AdamMajer Please review.
Diffstat (limited to 'modules/git/repo_tag.go')
-rw-r--r--modules/git/repo_tag.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/git/repo_tag.go b/modules/git/repo_tag.go
index 0b08e457cb..698b9b41f3 100644
--- a/modules/git/repo_tag.go
+++ b/modules/git/repo_tag.go
@@ -84,7 +84,7 @@ func (repo *Repository) GetTag(name string) (*Tag, error) {
return nil, err
}
- id, err := repo.objectFormat.NewIDFromString(idStr)
+ id, err := NewIDFromString(idStr)
if err != nil {
return nil, err
}
@@ -98,7 +98,7 @@ func (repo *Repository) GetTag(name string) (*Tag, error) {
// GetTagWithID returns a Git tag by given name and ID
func (repo *Repository) GetTagWithID(idStr, name string) (*Tag, error) {
- id, err := repo.objectFormat.NewIDFromString(idStr)
+ id, err := NewIDFromString(idStr)
if err != nil {
return nil, err
}
@@ -165,7 +165,7 @@ func parseTagRef(objectFormat ObjectFormat, ref map[string]string) (tag *Tag, er
Name: ref["refname:short"],
}
- tag.ID, err = objectFormat.NewIDFromString(ref["objectname"])
+ tag.ID, err = NewIDFromString(ref["objectname"])
if err != nil {
return nil, fmt.Errorf("parse objectname '%s': %w", ref["objectname"], err)
}
@@ -175,7 +175,7 @@ func parseTagRef(objectFormat ObjectFormat, ref map[string]string) (tag *Tag, er
tag.Object = tag.ID
} else {
// annotated tag
- tag.Object, err = objectFormat.NewIDFromString(ref["object"])
+ tag.Object, err = NewIDFromString(ref["object"])
if err != nil {
return nil, fmt.Errorf("parse object '%s': %w", ref["object"], err)
}
@@ -208,7 +208,7 @@ func parseTagRef(objectFormat ObjectFormat, ref map[string]string) (tag *Tag, er
// GetAnnotatedTag returns a Git tag by its SHA, must be an annotated tag
func (repo *Repository) GetAnnotatedTag(sha string) (*Tag, error) {
- id, err := repo.objectFormat.NewIDFromString(sha)
+ id, err := NewIDFromString(sha)
if err != nil {
return nil, err
}