Browse Source

Fix Submodule dection in subdir (#7275)

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

Fixes #7262
release/v1.9
mrsdizzie 4 years ago
committed by Lunny Xiao
parent
commit
a25b3d4c72
  1. 8
      modules/git/commit_info.go

8
modules/git/commit_info.go

@ -37,7 +37,13 @@ func (tes Entries) GetCommitsInfo(commit *Commit, treePath string, cache LastCom
entryCommit := convertCommit(rev)
if entry.IsSubModule() {
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
} else if subModule != nil {
subModuleURL = subModule.URL

Loading…
Cancel
Save