fork of https://github.com/sourcegraph/zoekt
zoekt-indexserver: Check stderr for git fetch (#603)
Instead of checking stdout, we check the combined output. By default, git fetch writes to stderr.
author
Rodrigo Silva Mendoza
committer
GitHub
date
(Jun 28, 2023, 2:36 PM +0200)
commit
b9e6d943
b9e6d9433e2e4438be6727ac3f1ae0a00e283220
parent
7078a585
7078a585a9e93edea9e2d6c1d5c11cb23694dc33
+7
-12
+7
-12
cmd/zoekt-indexserver/main.go
+7
-12
cmd/zoekt-indexserver/main.go
···
130
130
// update.
131
131
func fetchGitRepo(dir string) bool {
132
132
cmd := exec.Command("git", "--git-dir", dir, "fetch", "origin")
133
-
outBuf := &bytes.Buffer{}
134
-
errBuf := &bytes.Buffer{}
135
133
136
-
// Prevent prompting
137
-
cmd.Stdin = &bytes.Buffer{}
138
-
cmd.Stderr = errBuf
139
-
cmd.Stdout = outBuf
140
-
if err := cmd.Run(); err != nil {
141
-
log.Printf("command %s failed: %v\nOUT: %s\nERR: %s",
142
-
cmd.Args, err, outBuf.String(), errBuf.String())
143
-
} else {
144
-
return len(outBuf.Bytes()) != 0
134
+
output, err := cmd.CombinedOutput()
135
+
if err != nil {
136
+
log.Printf("command %s failed: %v\nCOMBINED_OUT: %s\n",
137
+
cmd.Args, err, string(output))
138
+
return false
145
139
}
146
-
return false
140
+
// When fetch found no updates, it prints nothing out
141
+
return len(output) != 0
147
142
}
148
143
149
144
// indexPendingRepos consumes the directories on the repos channel and