Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-07-20 03:58:26 +02:00
Code Issues Activity

Fix submodule nil check (#35096)

Browse Source 
Fix  #35095
This commit is contained in:
wxiaoguang 2025-07-16 20:07:38 +08:00 committed by GitHub
parent e1e4815a1c
commit fc4cb07beb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/git/commit_info.go
View File

@ -15,7 +15,7 @@ type CommitInfo struct {
func getCommitInfoSubmoduleFile(repoLink string, entry *TreeEntry, commit *Commit, treePathDir string) (*CommitSubmoduleFile, error) { func getCommitInfoSubmoduleFile(repoLink string, entry *TreeEntry, commit *Commit, treePathDir string) (*CommitSubmoduleFile, error) {
fullPath := path.Join(treePathDir, entry.Name()) fullPath := path.Join(treePathDir, entry.Name())
submodule, err := commit.GetSubModule(fullPath) submodule, err := commit.GetSubModule(fullPath)
if err != nil { if submodule == nil || err != nil {
return nil, err return nil, err
} }
return NewCommitSubmoduleFile(repoLink, fullPath, submodule.URL, entry.ID.String()), nil return NewCommitSubmoduleFile(repoLink, fullPath, submodule.URL, entry.ID.String()), nil

11
modules/git/commit_info_test.go
View File

@ -9,6 +9,7 @@ import (
"time" "time"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
) )
const ( const (
@ -120,6 +121,16 @@ func TestEntries_GetCommitsInfo(t *testing.T) {
defer clonedRepo1.Close() defer clonedRepo1.Close()
testGetCommitsInfo(t, clonedRepo1) testGetCommitsInfo(t, clonedRepo1)
t.Run("NonExistingSubmoduleAsNil", func(t *testing.T) {
commit, err := bareRepo1.GetCommit("HEAD")
require.NoError(t, err)
tree, err := commit.GetTreeEntryByPath("file1.txt")
require.NoError(t, err)
cisf, err := getCommitInfoSubmoduleFile("/any/repo-link", tree, commit, "")
require.NoError(t, err)
assert.Nil(t, cisf)
})
} }
func BenchmarkEntries_GetCommitsInfo(b *testing.B) { func BenchmarkEntries_GetCommitsInfo(b *testing.B) {

3
modules/git/commit_submodule.go
View File

@ -35,7 +35,8 @@ func (c *Commit) GetSubModules() (*ObjectCache[*SubModule], error) {
return c.submoduleCache, nil return c.submoduleCache, nil
} }
// GetSubModule get the submodule according entry name // GetSubModule gets the submodule by the entry name.
// It returns "nil, nil" if the submodule does not exist, caller should always remember to check the "nil"
func (c *Commit) GetSubModule(entryName string) (*SubModule, error) { func (c *Commit) GetSubModule(entryName string) (*SubModule, error) {
modules, err := c.GetSubModules() modules, err := c.GetSubModules()
if err != nil { if err != nil {