mirror of
https://github.com/go-gitea/gitea
synced 2024-11-21 21:41:10 +01:00
27e4b316f1
Backport #31791 by @wolfogre Found at https://github.com/go-gitea/gitea/pull/31790#issuecomment-2272898915 `unit-tests-gogit` never work since the workflow set `TAGS` with `gogit`, but the Makefile use `TEST_TAGS`. <img width="690" alt="image" src="https://github.com/user-attachments/assets/fb68df49-952b-42b9-8438-44200cefff43"> ![image](https://github.com/user-attachments/assets/78ff88c7-3b5f-4d50-9c58-e607bf7b1a71) This PR adds the values of `TAGS` to `TEST_TAGS`, ensuring that setting `TAGS` is always acceptable and avoiding confusion about which one should be set. After this PR: <img width="714" alt="image" src="https://github.com/user-attachments/assets/54cc7f38-d95b-4dbc-a87c-daba63462b86"> Co-authored-by: Jason Song <i@wolfogre.com>
62 lines
1.4 KiB
Go
62 lines
1.4 KiB
Go
// Copyright 2015 The Gogs Authors. All rights reserved.
|
|
// Copyright 2019 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
//go:build gogit
|
|
|
|
package git
|
|
|
|
import (
|
|
"errors"
|
|
|
|
"github.com/go-git/go-git/v5/plumbing"
|
|
)
|
|
|
|
func (repo *Repository) getTree(id ObjectID) (*Tree, error) {
|
|
gogitTree, err := repo.gogitRepo.TreeObject(plumbing.Hash(id.RawValue()))
|
|
if err != nil {
|
|
if errors.Is(err, plumbing.ErrObjectNotFound) {
|
|
return nil, ErrNotExist{
|
|
ID: id.String(),
|
|
}
|
|
}
|
|
return nil, err
|
|
}
|
|
|
|
tree := NewTree(repo, id)
|
|
tree.gogitTree = gogitTree
|
|
return tree, nil
|
|
}
|
|
|
|
// GetTree find the tree object in the repository.
|
|
func (repo *Repository) GetTree(idStr string) (*Tree, error) {
|
|
objectFormat, err := repo.GetObjectFormat()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if len(idStr) != objectFormat.FullLength() {
|
|
res, _, err := NewCommand(repo.Ctx, "rev-parse", "--verify").AddDynamicArguments(idStr).RunStdString(&RunOpts{Dir: repo.Path})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if len(res) > 0 {
|
|
idStr = res[:len(res)-1]
|
|
}
|
|
}
|
|
id, err := NewIDFromString(idStr)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
resolvedID := id
|
|
commitObject, err := repo.gogitRepo.CommitObject(plumbing.Hash(id.RawValue()))
|
|
if err == nil {
|
|
id = ParseGogitHash(commitObject.TreeHash)
|
|
}
|
|
treeObject, err := repo.getTree(id)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
treeObject.ResolvedID = resolvedID
|
|
return treeObject, nil
|
|
}
|