Skip to content

Commit

Permalink
Merge remote-tracking branch 'giteaofficial/main'
Browse files Browse the repository at this point in the history
* giteaofficial/main:
  Add `TAGS` to `TEST_TAGS` and fix bugs found with gogit (go-gitea#31791)
  • Loading branch information
zjjhot committed Aug 8, 2024
2 parents 19b1d19 + de2787a commit 40212b5
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ TAGS ?=
TAGS_SPLIT := $(subst $(COMMA), ,$(TAGS))
TAGS_EVIDENCE := $(MAKE_EVIDENCE_DIR)/tags

TEST_TAGS ?= sqlite sqlite_unlock_notify
TEST_TAGS ?= $(TAGS_SPLIT) sqlite sqlite_unlock_notify

TAR_EXCLUDES := .git data indexers queues log node_modules $(EXECUTABLE) $(FOMANTIC_WORK_DIR)/node_modules $(DIST) $(MAKE_EVIDENCE_DIR) $(AIR_TMP_DIR) $(GO_LICENSE_TMP_DIR)

Expand Down
5 changes: 5 additions & 0 deletions modules/git/blame_sha256_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ func TestReadingBlameOutputSha256(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()

if isGogit {
t.Skip("Skipping test since gogit does not support sha256")
return
}

t.Run("Without .git-blame-ignore-revs", func(t *testing.T) {
repo, err := OpenRepository(ctx, "./tests/repos/repo5_pulls_sha256")
assert.NoError(t, err)
Expand Down
11 changes: 10 additions & 1 deletion modules/git/repo_tree_gogit.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,20 @@

package git

import "github.com/go-git/go-git/v5/plumbing"
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
}

Expand Down

0 comments on commit 40212b5

Please sign in to comment.