diff options
| author | Adam Majer <amajer@suse.de> | 2023-12-13 21:02:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-13 21:02:00 +0000 |
| commit | cbf923e87bca0f50c2c01a60ccf544b63c365e98 (patch) | |
| tree | 9e2e66c688bdc0f740e1ae333847dfb33677c730 /modules/git/tree_gogit.go | |
| parent | 064f05204c0539d1f92895776dee7f626a628e3b (diff) | |
| download | gitea-cbf923e87bca0f50c2c01a60ccf544b63c365e98.tar.gz gitea-cbf923e87bca0f50c2c01a60ccf544b63c365e98.zip | |
Abstract hash function usage (#28138)
Refactor Hash interfaces and centralize hash function. This will allow
easier introduction of different hash function later on.
This forms the "no-op" part of the SHA256 enablement patch.
Diffstat (limited to 'modules/git/tree_gogit.go')
| -rw-r--r-- | modules/git/tree_gogit.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/git/tree_gogit.go b/modules/git/tree_gogit.go index fa601e6533..421b0ecb0f 100644 --- a/modules/git/tree_gogit.go +++ b/modules/git/tree_gogit.go @@ -15,8 +15,8 @@ import ( // Tree represents a flat directory listing. type Tree struct { - ID SHA1 - ResolvedID SHA1 + ID ObjectID + ResolvedID ObjectID repo *Repository gogitTree *object.Tree @@ -26,7 +26,7 @@ type Tree struct { } func (t *Tree) loadTreeObject() error { - gogitTree, err := t.repo.gogitRepo.TreeObject(t.ID) + gogitTree, err := t.repo.gogitRepo.TreeObject(plumbing.Hash(t.ID.RawValue())) if err != nil { return err } @@ -47,7 +47,7 @@ func (t *Tree) ListEntries() (Entries, error) { entries := make([]*TreeEntry, len(t.gogitTree.Entries)) for i, entry := range t.gogitTree.Entries { entries[i] = &TreeEntry{ - ID: entry.Hash, + ID: ParseGogitHash(entry.Hash), gogitTreeEntry: &t.gogitTree.Entries[i], ptree: t, } @@ -81,7 +81,7 @@ func (t *Tree) ListEntriesRecursiveWithSize() (Entries, error) { } convertedEntry := &TreeEntry{ - ID: entry.Hash, + ID: ParseGogitHash(entry.Hash), gogitTreeEntry: &entry, ptree: t, fullName: fullName, |