This repository was archived by the owner on Sep 11, 2020. It is now read-only.

Commit d7c00b0

committed

Handle io.EOF error in commitFileIter.ForEach

Signed-off-by: knqyf263 <knqyf263@gmail.com>

1 parent 0373247 commit d7c00b0Copy full SHA for d7c00b0

File tree

-2

lines changed

-2

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,9 @@ func isParentHash(hash plumbing.Hash, commit *Commit) bool {`
`128`	`128`	`func (c commitFileIter) ForEach(cb func(Commit) error) error {`
`129`	`129`	`for {`
`130`	`130`	`commit, nextErr := c.Next()`
`131`		`- if nextErr != nil {`
	`131`	`+ if nextErr == io.EOF {`
	`132`	`+ break`
	`133`	`+ } else if nextErr != nil {`
`132`	`134`	`return nextErr`
`133`	`135`	`}`
`134`	`136`	`err := cb(commit)`
`@@ -138,6 +140,7 @@ func (c commitFileIter) ForEach(cb func(Commit) error) error {`
`138`	`140`	`return err`
`139`	`141`	`}`
`140`	`142`	`}`
	`143`	`+ return nil`
`141`	`144`	`}`
`142`	`145`
`143`	`146`	`func (c *commitFileIter) Close() {`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ import (`
`13`	`13`	`"testing"`
`14`	`14`	`"time"`
`15`	`15`
`16`		`- fixtures "gopkg.in/src-d/go-git-fixtures.v3"`
`17`	`16`
`18`	`17`	`"golang.org/x/crypto/openpgp"`
`19`	`18`	`"golang.org/x/crypto/openpgp/armor"`
`@@ -33,6 +32,7 @@ import (`
`33`	`32`	`"gopkg.in/src-d/go-billy.v4/memfs"`
`34`	`33`	`"gopkg.in/src-d/go-billy.v4/osfs"`
`35`	`34`	`"gopkg.in/src-d/go-billy.v4/util"`
	`35`	`+ "gopkg.in/src-d/go-git-fixtures.v3"`
`36`	`36`	`)`
`37`	`37`
`38`	`38`	`type RepositorySuite struct {`

Comments

(0)