Update code.gitea.io/git (#3251)

release/v1.15
Ethan Koenig 2017-12-21 23:00:30 -08:00 committed by Lauris BH
parent 515cdaa85d
commit 156aa42ba0
2 changed files with 15 additions and 3 deletions

View File

@ -207,6 +207,10 @@ func getCommitsInfo(state *getCommitsInfoState) error {
if err := cmd.Start(); err != nil { if err := cmd.Start(); err != nil {
return err return err
} }
// it's okay to ignore the error returned by cmd.Wait(); we expect the
// subprocess to sometimes have a non-zero exit status, since we may
// prematurely close stdout, resulting in a broken pipe.
defer cmd.Wait()
numThreads := runtime.NumCPU() numThreads := runtime.NumCPU()
done := make(chan error, numThreads) done := make(chan error, numThreads)
@ -216,6 +220,14 @@ func getCommitsInfo(state *getCommitsInfoState) error {
scanner := bufio.NewScanner(readCloser) scanner := bufio.NewScanner(readCloser)
err = state.processGitLogOutput(scanner) err = state.processGitLogOutput(scanner)
// it is important that we close stdout here; if we do not close
// stdout, the subprocess will keep running, and the deffered call
// cmd.Wait() may block for a long time.
if closeErr := readCloser.Close(); closeErr != nil && err == nil {
err = closeErr
}
for i := 0; i < numThreads; i++ { for i := 0; i < numThreads; i++ {
doneErr := <-done doneErr := <-done
if doneErr != nil && err == nil { if doneErr != nil && err == nil {

6
vendor/vendor.json vendored
View File

@ -3,10 +3,10 @@
"ignore": "test appengine", "ignore": "test appengine",
"package": [ "package": [
{ {
"checksumSHA1": "4OG03XZWTU5eUkWPTOwIB6H4BF0=", "checksumSHA1": "Em29XiKkOh5rFFXdkCjqqsQ7fe4=",
"path": "code.gitea.io/git", "path": "code.gitea.io/git",
"revision": "4573c63ec9c8257caf11e361c238b6ceb53781d7", "revision": "4ec3654064ef7eef4f05f891073a38039ad8d0f7",
"revisionTime": "2017-12-20T02:56:39Z" "revisionTime": "2017-12-22T02:43:26Z"
}, },
{ {
"checksumSHA1": "QQ7g7B9+EIzGjO14KCGEs9TNEzM=", "checksumSHA1": "QQ7g7B9+EIzGjO14KCGEs9TNEzM=",