aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Bartel <github@spottybenny.ca>2018-07-07 23:20:05 -0400
committerMark Bartel <github@spottybenny.ca>2018-07-07 23:20:05 -0400
commitf0c4318e7b8d5cbf91723c71a4ba20d1bd0cfaf5 (patch)
tree5009f2ccb16aecae80bf7939bec50752d6170f73
parent7ff71b5a66eea98983c610d33523041a5a829e2f (diff)
downloadgo-git-f0c4318e7b8d5cbf91723c71a4ba20d1bd0cfaf5.tar.gz
worktree: address PR comments: sort imports appropriately
Signed-off-by: Mark Bartel <github@spottybenny.ca>
-rw-r--r--worktree_commit.go2
-rw-r--r--worktree_commit_test.go10
2 files changed, 6 insertions, 6 deletions
diff --git a/worktree_commit.go b/worktree_commit.go
index ee5cd82..f0e0b42 100644
--- a/worktree_commit.go
+++ b/worktree_commit.go
@@ -2,6 +2,7 @@ package git
import (
"path"
+ "sort"
"strings"
"gopkg.in/src-d/go-git.v4/plumbing"
@@ -11,7 +12,6 @@ import (
"gopkg.in/src-d/go-git.v4/storage"
"gopkg.in/src-d/go-billy.v4"
- "sort"
)
// Commit stores the current contents of the index in a new commit along with
diff --git a/worktree_commit_test.go b/worktree_commit_test.go
index 2100626..5ca9b51 100644
--- a/worktree_commit_test.go
+++ b/worktree_commit_test.go
@@ -1,22 +1,22 @@
package git
import (
+ "bytes"
+ "io/ioutil"
+ "os"
+ "os/exec"
"time"
"gopkg.in/src-d/go-git.v4/plumbing"
"gopkg.in/src-d/go-git.v4/plumbing/object"
"gopkg.in/src-d/go-git.v4/plumbing/storer"
"gopkg.in/src-d/go-git.v4/storage/memory"
+ "gopkg.in/src-d/go-git.v4/storage/filesystem"
- "bytes"
. "gopkg.in/check.v1"
"gopkg.in/src-d/go-billy.v4/memfs"
"gopkg.in/src-d/go-billy.v4/osfs"
"gopkg.in/src-d/go-billy.v4/util"
- "gopkg.in/src-d/go-git.v4/storage/filesystem"
- "io/ioutil"
- "os"
- "os/exec"
)
func (s *WorktreeSuite) TestCommitInvalidOptions(c *C) {