fix nil

cristaloleg · cristaloleg · commit f9cf9a99fd51 · 2020-07-01T21:03:12.000+02:00
diff --git a/plumbing/format/index/decoder_test.go b/plumbing/format/index/decoder_test.go
@@ -6,8 +6,8 @@ import (
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-git/go-git/v5/plumbing/filemode"
 
+	fixtures "github.com/go-git/go-git-fixtures/v4"
 	. "gopkg.in/check.v1"
-	"github.com/go-git/go-git-fixtures/v4"
 )
 
 func Test(t *testing.T) { TestingT(t) }
diff --git a/plumbing/format/objfile/reader_test.go b/plumbing/format/objfile/reader_test.go
@@ -7,8 +7,9 @@ import (
 	"io"
 	"io/ioutil"
 
-	. "gopkg.in/check.v1"
 	"github.com/go-git/go-git/v5/plumbing"
+
+	. "gopkg.in/check.v1"
 )
 
 type SuiteReader struct{}
diff --git a/plumbing/object/file_test.go b/plumbing/object/file_test.go
@@ -9,8 +9,8 @@ import (
 	"github.com/go-git/go-git/v5/plumbing/storer"
 	"github.com/go-git/go-git/v5/storage/filesystem"
 
+	fixtures "github.com/go-git/go-git-fixtures/v4"
 	. "gopkg.in/check.v1"
-	"github.com/go-git/go-git-fixtures/v4"
 )
 
 type FileSuite struct {
diff --git a/plumbing/transport/file/receive_pack_test.go b/plumbing/transport/file/receive_pack_test.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/go-git/go-git/v5/plumbing/transport/test"
 
+	fixtures "github.com/go-git/go-git-fixtures/v4"
 	. "gopkg.in/check.v1"
-	"github.com/go-git/go-git-fixtures/v4"
 )
 
 type ReceivePackSuite struct {
diff --git a/plumbing/transport/git/upload_pack_test.go b/plumbing/transport/git/upload_pack_test.go
@@ -3,8 +3,8 @@ package git
 import (
 	"github.com/go-git/go-git/v5/plumbing/transport/test"
 
+	fixtures "github.com/go-git/go-git-fixtures/v4"
 	. "gopkg.in/check.v1"
-	"github.com/go-git/go-git-fixtures/v4"
 )
 
 type UploadPackSuite struct {
diff --git a/plumbing/transport/server/receive_pack_test.go b/plumbing/transport/server/receive_pack_test.go
@@ -60,5 +60,5 @@ func (s *ReceivePackSuite) TestReceivePackWithNilPackfile(c *C) {
 
 	report, err := r.ReceivePack(context.Background(), req)
 	c.Assert(report, IsNil, comment)
-	c.Assert(err, IsNil, comment)
+	c.Assert(err, NotNil, comment)
 }
diff --git a/utils/merkletrie/filesystem/node_test.go b/utils/merkletrie/filesystem/node_test.go
@@ -7,12 +7,13 @@ import (
 	"path"
 	"testing"
 
-	"github.com/go-git/go-billy/v5"
-	"github.com/go-git/go-billy/v5/memfs"
-	. "gopkg.in/check.v1"
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-git/go-git/v5/utils/merkletrie"
 	"github.com/go-git/go-git/v5/utils/merkletrie/noder"
+
+	"github.com/go-git/go-billy/v5"
+	"github.com/go-git/go-billy/v5/memfs"
+	. "gopkg.in/check.v1"
 )
 
 func Test(t *testing.T) { TestingT(t) }

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ import (`
`6`	`6`	`"github.com/go-git/go-git/v5/plumbing"`
`7`	`7`	`"github.com/go-git/go-git/v5/plumbing/filemode"`
`8`	`8`
	`9`	`+ fixtures "github.com/go-git/go-git-fixtures/v4"`
`9`	`10`	`. "gopkg.in/check.v1"`
`10`		`- "github.com/go-git/go-git-fixtures/v4"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func Test(t *testing.T) { TestingT(t) }`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,9 @@ import (`
`7`	`7`	`"io"`
`8`	`8`	`"io/ioutil"`
`9`	`9`
`10`		`- . "gopkg.in/check.v1"`
`11`	`10`	`"github.com/go-git/go-git/v5/plumbing"`
	`11`	`+`
	`12`	`+ . "gopkg.in/check.v1"`
`12`	`13`	`)`
`13`	`14`
`14`	`15`	`type SuiteReader struct{}`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@ import (`
`9`	`9`	`"github.com/go-git/go-git/v5/plumbing/storer"`
`10`	`10`	`"github.com/go-git/go-git/v5/storage/filesystem"`
`11`	`11`
	`12`	`+ fixtures "github.com/go-git/go-git-fixtures/v4"`
`12`	`13`	`. "gopkg.in/check.v1"`
`13`		`- "github.com/go-git/go-git-fixtures/v4"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`type FileSuite struct {`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ import (`
`5`	`5`
`6`	`6`	`"github.com/go-git/go-git/v5/plumbing/transport/test"`
`7`	`7`
	`8`	`+ fixtures "github.com/go-git/go-git-fixtures/v4"`
`8`	`9`	`. "gopkg.in/check.v1"`
`9`		`- "github.com/go-git/go-git-fixtures/v4"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`type ReceivePackSuite struct {`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ package git`
`3`	`3`	`import (`
`4`	`4`	`"github.com/go-git/go-git/v5/plumbing/transport/test"`
`5`	`5`
	`6`	`+ fixtures "github.com/go-git/go-git-fixtures/v4"`
`6`	`7`	`. "gopkg.in/check.v1"`
`7`		`- "github.com/go-git/go-git-fixtures/v4"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`type UploadPackSuite struct {`
Original file line number	Diff line number	Diff line change
`@@ -60,5 +60,5 @@ func (s ReceivePackSuite) TestReceivePackWithNilPackfile(c C) {`
`60`	`60`
`61`	`61`	`report, err := r.ReceivePack(context.Background(), req)`
`62`	`62`	`c.Assert(report, IsNil, comment)`
`63`		`- c.Assert(err, IsNil, comment)`
	`63`	`+ c.Assert(err, NotNil, comment)`
`64`	`64`	`}`