Merge pull request #452 from taralx/patch-1

mcuadros · web-flow · commit 7e733657d9cd · 2017-06-24T00:30:29.000-07:00
storage/filesystem: Fix nil dereference in Shallow()
diff --git a/storage/filesystem/shallow.go b/storage/filesystem/shallow.go
@@ -36,7 +36,7 @@ func (s *ShallowStorage) SetShallow(commits []plumbing.Hash) error {
 // Shallow return the shallow commits reading from shallo file from .git
 func (s *ShallowStorage) Shallow() ([]plumbing.Hash, error) {
 	f, err := s.dir.Shallow()
-	if err != nil {
+	if f == nil || err != nil {
 		return nil, err
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ func (s *ShallowStorage) SetShallow(commits []plumbing.Hash) error {`
`36`	`36`	`// Shallow return the shallow commits reading from shallo file from .git`
`37`	`37`	`func (s *ShallowStorage) Shallow() ([]plumbing.Hash, error) {`
`38`	`38`	`f, err := s.dir.Shallow()`
`39`		`- if err != nil {`
	`39`	`+ if f == nil \|\| err != nil {`
`40`	`40`	`return nil, err`
`41`	`41`	`}`
`42`	`42`