Skip to content
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Use pipeline for GetSubmoduleCommits
Signed-off-by: Steffen Schröter <[email protected]>
  • Loading branch information
sschroe committed Jul 5, 2021
commit 4113314f3715e8b4fded549e79ffe52fe75d8790
37 changes: 27 additions & 10 deletions modules/git/submodule.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
package git

import (
"bufio"
"fmt"
"io"
"net"
"net/url"
"path"
Expand Down Expand Up @@ -133,25 +135,40 @@ func (sf *SubModuleFile) RefID() string {

// GetSubmoduleCommits Returns a list of active submodules in the repository
func GetSubmoduleCommits(repoPath string) []SubModuleCommit {
stdoutReader, stdoutWriter := io.Pipe()
defer func() {
_ = stdoutReader.Close()
_ = stdoutWriter.Close()
}()

go func() {
stderrBuilder := &strings.Builder{}
err := NewCommand("config", "-f", ".gitmodules", "--list", "--name-only").RunInDirPipeline(repoPath, stdoutWriter, stderrBuilder)
if err != nil {
_ = stdoutWriter.CloseWithError(ConcatenateError(err, stderrBuilder.String()))
} else {
_ = stdoutWriter.Close()
}
}()

var submodules []SubModuleCommit
bufReader := bufio.NewReader(stdoutReader)

submoduleOut, err := NewCommand("config", "-f", ".gitmodules", "--list", "--name-only").
RunInDir(repoPath)
for {
line, err := bufReader.ReadString('\n')

if err != nil {
// Command fails if there are no or invalid submodules, just return an empty list
return submodules
}
if err != nil {
break
}

for _, line := range strings.Split(strings.TrimSuffix(submoduleOut, "\n"), "\n") {
if len(line) < len("submodule.x.url") ||
if len(line) < len("submodule.x.url\n") ||
!strings.HasPrefix(line, "submodule.") ||
!strings.HasSuffix(line, ".url") {
!strings.HasSuffix(line, ".url\n") {

continue
}

name := line[len("submodule.") : len(line)-len(".url")]
name := line[len("submodule.") : len(line)-len(".url\n")]
name = strings.TrimSpace(name)

if len(name) == 0 {
Expand Down