Skip to content

Fix submodule parsing (#32571) #32577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 21, 2024
Merged

Fix submodule parsing (#32571) #32577

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52db4cb
fix
wxiaoguang Nov 20, 2024
adb668a
add tests
wxiaoguang Nov 21, 2024
29e5cc3
fine tune
wxiaoguang Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions modules/git/commit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,24 +379,31 @@ func (c *Commit) GetSubModules() (*ObjectCache, error) {
defer rd.Close()
scanner := bufio.NewScanner(rd)
c.submoduleCache = newObjectCache()
var ismodule bool
var path string
var subModule *SubModule
for scanner.Scan() {
if strings.HasPrefix(scanner.Text(), "[submodule") {
ismodule = true
if strings.HasPrefix(scanner.Text(), "[") {
if subModule != nil {
c.submoduleCache.Set(subModule.Name, subModule)
subModule = nil
}
if strings.HasPrefix(scanner.Text(), "[submodule") {
subModule = &SubModule{}
}
continue
}
if ismodule {
if subModule != nil {
fields := strings.Split(scanner.Text(), "=")
k := strings.TrimSpace(fields[0])
if k == "path" {
path = strings.TrimSpace(fields[1])
subModule.Name = strings.TrimSpace(fields[1])
} else if k == "url" {
c.submoduleCache.Set(path, &SubModule{path, strings.TrimSpace(fields[1])})
ismodule = false
subModule.URL = strings.TrimSpace(fields[1])
}
}
}
if subModule != nil {
c.submoduleCache.Set(subModule.Name, subModule)
}
if err = scanner.Err(); err != nil {
return nil, fmt.Errorf("GetSubModules scan: %w", err)
}
Expand Down