Update code.gitea.io/git (#3251)
This commit is contained in:
parent
515cdaa85d
commit
156aa42ba0
|
@ -207,6 +207,10 @@ func getCommitsInfo(state *getCommitsInfoState) error {
|
|||
if err := cmd.Start(); err != nil {
|
||||
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()
|
||||
done := make(chan error, numThreads)
|
||||
|
@ -216,6 +220,14 @@ func getCommitsInfo(state *getCommitsInfoState) error {
|
|||
|
||||
scanner := bufio.NewScanner(readCloser)
|
||||
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++ {
|
||||
doneErr := <-done
|
||||
if doneErr != nil && err == nil {
|
||||
|
|
|
@ -3,10 +3,10 @@
|
|||
"ignore": "test appengine",
|
||||
"package": [
|
||||
{
|
||||
"checksumSHA1": "4OG03XZWTU5eUkWPTOwIB6H4BF0=",
|
||||
"checksumSHA1": "Em29XiKkOh5rFFXdkCjqqsQ7fe4=",
|
||||
"path": "code.gitea.io/git",
|
||||
"revision": "4573c63ec9c8257caf11e361c238b6ceb53781d7",
|
||||
"revisionTime": "2017-12-20T02:56:39Z"
|
||||
"revision": "4ec3654064ef7eef4f05f891073a38039ad8d0f7",
|
||||
"revisionTime": "2017-12-22T02:43:26Z"
|
||||
},
|
||||
{
|
||||
"checksumSHA1": "QQ7g7B9+EIzGjO14KCGEs9TNEzM=",
|
||||
|
|
Loading…
Reference in New Issue