Merge pull request #740 from ferhatelmas/shallow-storage-err

mcuadros · web-flow · commit 98916b85c6fe · 2018-02-02T10:08:16.000+01:00
storage/filesystem/shallow: fix error checking
diff --git a/storage/filesystem/shallow.go b/storage/filesystem/shallow.go
@@ -26,7 +26,7 @@ func (s *ShallowStorage) SetShallow(commits []plumbing.Hash) error {
 
 	defer ioutil.CheckClose(f, &err)
 	for _, h := range commits {
-		if _, err := fmt.Fprintf(f, "%s\n", h); err != err {
+		if _, err := fmt.Fprintf(f, "%s\n", h); err != nil {
 			return err
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ func (s *ShallowStorage) SetShallow(commits []plumbing.Hash) error {`
`26`	`26`
`27`	`27`	`defer ioutil.CheckClose(f, &err)`
`28`	`28`	`for _, h := range commits {`
`29`		`- if _, err := fmt.Fprintf(f, "%s\n", h); err != err {`
	`29`	`+ if _, err := fmt.Fprintf(f, "%s\n", h); err != nil {`
`30`	`30`	`return err`
`31`	`31`	`}`
`32`	`32`	`}`