Hri7566
/
gitea
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix Submodule dection in subdir (#7275) 

Include the directory in name when looking for matching Submodule from
.gitmodules file

Fixes #7262
This commit is contained in:
mrsdizzie 2019-06-21 02:13:54 -04:00 committed by Lunny Xiao
parent 8db4541ecf
commit a25b3d4c72
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/git/commit_info.go
View File

@ -37,7 +37,13 @@ func (tes Entries) GetCommitsInfo(commit *Commit, treePath string, cache LastCom
entryCommit := convertCommit(rev) entryCommit := convertCommit(rev)
if entry.IsSubModule() { if entry.IsSubModule() {
subModuleURL := "" subModuleURL := ""
if subModule, err := commit.GetSubModule(entry.Name()); err != nil { var fullPath string
if len(treePath) > 0 {
fullPath = treePath + "/" + entry.Name()
} else {
fullPath = entry.Name()
}
if subModule, err := commit.GetSubModule(fullPath); err != nil {
return nil, nil, err return nil, nil, err
} else if subModule != nil { } else if subModule != nil {
subModuleURL = subModule.URL subModuleURL = subModule.URL