Fix format with go fmt

config/config.go

@@ -3,9 +3,9 @@ package config
 import (
 	"errors"
 	"flag"
+	"github.com/lesfurets/git-octopus/git"
 	"strconv"
 	"strings"
-	"github.com/lesfurets/git-octopus/git"
 )
 
 type OctopusConfig struct {

config/config_test.go

@@ -1,10 +1,10 @@
 package config
 
 import (
-	"github.com/stretchr/testify/assert"
-	"testing"
 	"github.com/lesfurets/git-octopus/git"
 	"github.com/lesfurets/git-octopus/test"
+	"github.com/stretchr/testify/assert"
+	"testing"
 )
 
 func createTestRepo() *git.Repository {

functionnal_tests/basics_test.go

@@ -1,15 +1,15 @@
 package functionnal_tests
 
 import (
-	"testing"
+	"github.com/lesfurets/git-octopus/git"
 	"github.com/lesfurets/git-octopus/run"
+	"github.com/lesfurets/git-octopus/test"
 	"github.com/stretchr/testify/assert"
+	"io/ioutil"
 	"os"
 	"path/filepath"
-	"io/ioutil"
 	"strings"
-	"github.com/lesfurets/git-octopus/git"
-	"github.com/lesfurets/git-octopus/test"
+	"testing"
 )
 
 func TestVersion(t *testing.T) {

functionnal_tests/edge_cases_test.go

@@ -1,10 +1,10 @@
 package functionnal_tests
 
 import (
-	"testing"
 	"github.com/lesfurets/git-octopus/run"
-	"github.com/stretchr/testify/assert"
 	"github.com/lesfurets/git-octopus/test"
+	"github.com/stretchr/testify/assert"
+	"testing"
 )
 
 func TestOctopusCommitConfigError(t *testing.T) {
@@ -76,7 +76,7 @@ func TestUncleanStateFail(t *testing.T) {
 
 	err := run.Run(context, "*")
 
-	if (assert.NotNil(t, err)) {
+	if assert.NotNil(t, err) {
 		assert.Contains(t, err.Error(), "The repository has to be clean.")
 	}
-}
+}

functionnal_tests/no_commit_test.go

@@ -1,10 +1,10 @@
 package functionnal_tests
 
 import (
-	"testing"
 	"github.com/lesfurets/git-octopus/run"
 	"github.com/lesfurets/git-octopus/test"
 	"github.com/stretchr/testify/assert"
+	"testing"
 )
 
 func TestFastForward(t *testing.T) {
@@ -60,4 +60,4 @@ func TestConflictState(t *testing.T) {
 
 	status, _ := repo.Git("status", "--porcelain")
 	assert.Empty(t, status)
-}
+}

run/matcher_test.go

@@ -1,9 +1,9 @@
 package run
 
 import (
+	"github.com/lesfurets/git-octopus/test"
 	"github.com/stretchr/testify/assert"
 	"testing"
-	"github.com/lesfurets/git-octopus/test"
 )
 
 func setupRepo() *OctopusContext {

run/run.go

@@ -1,13 +1,13 @@
 package run
 
 import (
-	"github.com/lesfurets/git-octopus/git"
-	"log"
+	"bytes"
 	"errors"
 	"github.com/lesfurets/git-octopus/config"
-	"strings"
-	"bytes"
+	"github.com/lesfurets/git-octopus/git"
 	"github.com/lesfurets/git-octopus/test"
+	"log"
+	"strings"
 )
 
 type OctopusContext struct {
@@ -62,7 +62,7 @@ func Run(context *OctopusContext, args ...string) error {
 	// parents always contains HEAD. We need at lease 2 parents to create a merge commit
 	if octopusConfig.DoCommit && parents != nil && len(parents) > 1 {
 		tree, _ := context.Repo.Git("write-tree")
-		args := []string {"commit-tree"}
+		args := []string{"commit-tree"}
 		for _, parent := range parents {
 			args = append(args, "-p", parent)
 		}
@@ -144,7 +144,6 @@ func octopusCommitMessage(remotes map[string]string) string {
 	return "octopus commit"
 }
 
-
 func CreateTestContext() (*OctopusContext, *bytes.Buffer) {
 	dir := test.CreateTempDir()
 

test/test_utils.go

@@ -1,8 +1,8 @@
 package test
 
 import (
-	"io/ioutil"
 	"github.com/lesfurets/git-octopus/git"
+	"io/ioutil"
 	"os"
 )
 
@@ -13,4 +13,4 @@ func CreateTempDir() string {
 
 func Cleanup(repo *git.Repository) error {
 	return os.RemoveAll(repo.Path)
-}
+}