Merge pull request go-git#672 from ferhatelmas/gofmt-s

mcuadros · web-flow · commit e20d3347d26f · 2017-12-01T00:45:24.000+01:00
all: gofmt -s
diff --git a/_examples/common_test.go b/_examples/common_test.go
@@ -15,17 +15,17 @@ var examplesTest = flag.Bool("examples", false, "run the examples tests")
 var defaultURL = "https://github.com/git-fixtures/basic.git"
 
 var args = map[string][]string{
-	"checkout":    []string{defaultURL, tempFolder(), "35e85108805c84807bc66a02d91535e1e24b38b9"},
-	"clone":       []string{defaultURL, tempFolder()},
-	"context":     []string{defaultURL, tempFolder()},
-	"commit":      []string{cloneRepository(defaultURL, tempFolder())},
-	"custom_http": []string{defaultURL},
-	"open":        []string{cloneRepository(defaultURL, tempFolder())},
-	"progress":    []string{defaultURL, tempFolder()},
-	"push":        []string{setEmptyRemote(cloneRepository(defaultURL, tempFolder()))},
-	"showcase":    []string{defaultURL, tempFolder()},
-	"tag":         []string{cloneRepository(defaultURL, tempFolder())},
-	"pull":        []string{createRepositoryWithRemote(tempFolder(), defaultURL)},
+	"checkout":    {defaultURL, tempFolder(), "35e85108805c84807bc66a02d91535e1e24b38b9"},
+	"clone":       {defaultURL, tempFolder()},
+	"context":     {defaultURL, tempFolder()},
+	"commit":      {cloneRepository(defaultURL, tempFolder())},
+	"custom_http": {defaultURL},
+	"open":        {cloneRepository(defaultURL, tempFolder())},
+	"progress":    {defaultURL, tempFolder()},
+	"push":        {setEmptyRemote(cloneRepository(defaultURL, tempFolder()))},
+	"showcase":    {defaultURL, tempFolder()},
+	"tag":         {cloneRepository(defaultURL, tempFolder())},
+	"pull":        {createRepositoryWithRemote(tempFolder(), defaultURL)},
 }
 
 var ignored = map[string]bool{}
diff --git a/plumbing/format/index/decoder_test.go b/plumbing/format/index/decoder_test.go
@@ -6,8 +6,8 @@ import (
 	"gopkg.in/src-d/go-git.v4/plumbing"
 	"gopkg.in/src-d/go-git.v4/plumbing/filemode"
 
-	"gopkg.in/src-d/go-git-fixtures.v3"
 	. "gopkg.in/check.v1"
+	"gopkg.in/src-d/go-git-fixtures.v3"
 )
 
 func Test(t *testing.T) { TestingT(t) }
diff --git a/plumbing/format/packfile/encoder_advanced_test.go b/plumbing/format/packfile/encoder_advanced_test.go
@@ -10,8 +10,8 @@ import (
 	"gopkg.in/src-d/go-git.v4/storage/filesystem"
 	"gopkg.in/src-d/go-git.v4/storage/memory"
 
-	"gopkg.in/src-d/go-git-fixtures.v3"
 	. "gopkg.in/check.v1"
+	"gopkg.in/src-d/go-git-fixtures.v3"
 )
 
 type EncoderAdvancedSuite struct {
diff --git a/plumbing/format/packfile/scanner_test.go b/plumbing/format/packfile/scanner_test.go
@@ -6,8 +6,8 @@ import (
 
 	"gopkg.in/src-d/go-git.v4/plumbing"
 
-	"gopkg.in/src-d/go-git-fixtures.v3"
 	. "gopkg.in/check.v1"
+	"gopkg.in/src-d/go-git-fixtures.v3"
 )
 
 type ScannerSuite struct {
diff --git a/plumbing/object/change_adaptor_test.go b/plumbing/object/change_adaptor_test.go
@@ -10,8 +10,8 @@ import (
 	"gopkg.in/src-d/go-git.v4/utils/merkletrie"
 	"gopkg.in/src-d/go-git.v4/utils/merkletrie/noder"
 
-	"gopkg.in/src-d/go-git-fixtures.v3"
 	. "gopkg.in/check.v1"
+	"gopkg.in/src-d/go-git-fixtures.v3"
 )
 
 type ChangeAdaptorSuite struct {
diff --git a/plumbing/object/difftree_test.go b/plumbing/object/difftree_test.go
@@ -11,8 +11,8 @@ import (
 	"gopkg.in/src-d/go-git.v4/storage/memory"
 	"gopkg.in/src-d/go-git.v4/utils/merkletrie"
 
-	"gopkg.in/src-d/go-git-fixtures.v3"
 	. "gopkg.in/check.v1"
+	"gopkg.in/src-d/go-git-fixtures.v3"
 )
 
 type DiffTreeSuite struct {
diff --git a/plumbing/object/file_test.go b/plumbing/object/file_test.go
@@ -8,8 +8,8 @@ import (
 	"gopkg.in/src-d/go-git.v4/plumbing/storer"
 	"gopkg.in/src-d/go-git.v4/storage/filesystem"
 
-	"gopkg.in/src-d/go-git-fixtures.v3"
 	. "gopkg.in/check.v1"
+	"gopkg.in/src-d/go-git-fixtures.v3"
 )
 
 type FileSuite struct {
diff --git a/plumbing/object/object_test.go b/plumbing/object/object_test.go
@@ -11,8 +11,8 @@ import (
 	"gopkg.in/src-d/go-git.v4/plumbing/storer"
 	"gopkg.in/src-d/go-git.v4/storage/filesystem"
 
-	"gopkg.in/src-d/go-git-fixtures.v3"
 	. "gopkg.in/check.v1"
+	"gopkg.in/src-d/go-git-fixtures.v3"
 )
 
 func Test(t *testing.T) { TestingT(t) }
diff --git a/plumbing/revlist/revlist_test.go b/plumbing/revlist/revlist_test.go
@@ -8,8 +8,8 @@ import (
 	"gopkg.in/src-d/go-git.v4/plumbing/storer"
 	"gopkg.in/src-d/go-git.v4/storage/filesystem"
 
-	"gopkg.in/src-d/go-git-fixtures.v3"
 	. "gopkg.in/check.v1"
+	"gopkg.in/src-d/go-git-fixtures.v3"
 )
 
 func Test(t *testing.T) { TestingT(t) }
diff --git a/plumbing/transport/http/receive_pack_test.go b/plumbing/transport/http/receive_pack_test.go
@@ -3,8 +3,8 @@ package http
 import (
 	"gopkg.in/src-d/go-git.v4/plumbing/transport/test"
 
-	"gopkg.in/src-d/go-git-fixtures.v3"
 	. "gopkg.in/check.v1"
+	"gopkg.in/src-d/go-git-fixtures.v3"
 )
 
 type ReceivePackSuite struct {
diff --git a/plumbing/transport/ssh/upload_pack_test.go b/plumbing/transport/ssh/upload_pack_test.go
@@ -15,9 +15,9 @@ import (
 	"gopkg.in/src-d/go-git.v4/plumbing/transport/test"
 
 	"github.com/gliderlabs/ssh"
-	"gopkg.in/src-d/go-git-fixtures.v3"
 	stdssh "golang.org/x/crypto/ssh"
 	. "gopkg.in/check.v1"
+	"gopkg.in/src-d/go-git-fixtures.v3"
 )
 
 type UploadPackSuite struct {
diff --git a/storage/test/storage_suite.go b/storage/test/storage_suite.go
@@ -13,8 +13,8 @@ import (
 	"gopkg.in/src-d/go-git.v4/plumbing/storer"
 	"gopkg.in/src-d/go-git.v4/storage"
 
-	"gopkg.in/src-d/go-git-fixtures.v3"
 	. "gopkg.in/check.v1"
+	"gopkg.in/src-d/go-git-fixtures.v3"
 )
 
 type Storer interface {

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ import (`
`6`	`6`	`"gopkg.in/src-d/go-git.v4/plumbing"`
`7`	`7`	`"gopkg.in/src-d/go-git.v4/plumbing/filemode"`
`8`	`8`
`9`		`- "gopkg.in/src-d/go-git-fixtures.v3"`
`10`	`9`	`. "gopkg.in/check.v1"`
	`10`	`+ "gopkg.in/src-d/go-git-fixtures.v3"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func Test(t *testing.T) { TestingT(t) }`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ import (`
`10`	`10`	`"gopkg.in/src-d/go-git.v4/storage/filesystem"`
`11`	`11`	`"gopkg.in/src-d/go-git.v4/storage/memory"`
`12`	`12`
`13`		`- "gopkg.in/src-d/go-git-fixtures.v3"`
`14`	`13`	`. "gopkg.in/check.v1"`
	`14`	`+ "gopkg.in/src-d/go-git-fixtures.v3"`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`type EncoderAdvancedSuite struct {`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ import (`
`11`	`11`	`"gopkg.in/src-d/go-git.v4/storage/memory"`
`12`	`12`	`"gopkg.in/src-d/go-git.v4/utils/merkletrie"`
`13`	`13`
`14`		`- "gopkg.in/src-d/go-git-fixtures.v3"`
`15`	`14`	`. "gopkg.in/check.v1"`
	`15`	`+ "gopkg.in/src-d/go-git-fixtures.v3"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`type DiffTreeSuite struct {`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ import (`
`8`	`8`	`"gopkg.in/src-d/go-git.v4/plumbing/storer"`
`9`	`9`	`"gopkg.in/src-d/go-git.v4/storage/filesystem"`
`10`	`10`
`11`		`- "gopkg.in/src-d/go-git-fixtures.v3"`
`12`	`11`	`. "gopkg.in/check.v1"`
	`12`	`+ "gopkg.in/src-d/go-git-fixtures.v3"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`type FileSuite struct {`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ package http`
`3`	`3`	`import (`
`4`	`4`	`"gopkg.in/src-d/go-git.v4/plumbing/transport/test"`
`5`	`5`
`6`		`- "gopkg.in/src-d/go-git-fixtures.v3"`
`7`	`6`	`. "gopkg.in/check.v1"`
	`7`	`+ "gopkg.in/src-d/go-git-fixtures.v3"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`type ReceivePackSuite struct {`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,9 @@ import (`
`15`	`15`	`"gopkg.in/src-d/go-git.v4/plumbing/transport/test"`
`16`	`16`
`17`	`17`	`"github.com/gliderlabs/ssh"`
`18`		`- "gopkg.in/src-d/go-git-fixtures.v3"`
`19`	`18`	`stdssh "golang.org/x/crypto/ssh"`
`20`	`19`	`. "gopkg.in/check.v1"`
	`20`	`+ "gopkg.in/src-d/go-git-fixtures.v3"`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`type UploadPackSuite struct {`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ import (`
`13`	`13`	`"gopkg.in/src-d/go-git.v4/plumbing/storer"`
`14`	`14`	`"gopkg.in/src-d/go-git.v4/storage"`
`15`	`15`
`16`		`- "gopkg.in/src-d/go-git-fixtures.v3"`
`17`	`16`	`. "gopkg.in/check.v1"`
	`17`	`+ "gopkg.in/src-d/go-git-fixtures.v3"`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`type Storer interface {`