aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJavi Fontan <jfontan@gmail.com>2018-08-31 12:29:27 +0200
committerJavi Fontan <jfontan@gmail.com>2018-08-31 12:29:27 +0200
commit2a7c664b62dd0d87f7ab67b30b1952727788cffa (patch)
tree003b65896424257e26d1f28ba2d8c9a4388fa223
parentd7e6cf5b73947108d0c16b9c04b38891de47ef5d (diff)
downloadgo-git-2a7c664b62dd0d87f7ab67b30b1952727788cffa.tar.gz
git: do not expose storage options in PlainOpen
Signed-off-by: Javi Fontan <jfontan@gmail.com>
-rw-r--r--options.go4
-rw-r--r--repository.go2
-rw-r--r--repository_test.go22
3 files changed, 1 insertions, 27 deletions
diff --git a/options.go b/options.go
index f67a454..7b1570f 100644
--- a/options.go
+++ b/options.go
@@ -9,7 +9,6 @@ import (
"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/protocol/packp/sideband"
- "gopkg.in/src-d/go-git.v4/plumbing/storer"
"gopkg.in/src-d/go-git.v4/plumbing/transport"
)
@@ -429,9 +428,6 @@ func (o *GrepOptions) Validate(w *Worktree) error {
// PlainOpenOptions describes how opening a plain repository should be
// performed.
type PlainOpenOptions struct {
- // Storage layer options.
- Storage storer.Options
-
// DetectDotGit defines whether parent directories should be
// walked until a .git directory or file is found.
DetectDotGit bool
diff --git a/repository.go b/repository.go
index 4ad5252..f619934 100644
--- a/repository.go
+++ b/repository.go
@@ -251,7 +251,7 @@ func PlainOpenWithOptions(path string, o *PlainOpenOptions) (*Repository, error)
return nil, err
}
- s, err := filesystem.NewStorageWithOptions(dot, o.Storage)
+ s, err := filesystem.NewStorage(dot)
if err != nil {
return nil, err
}
diff --git a/repository_test.go b/repository_test.go
index 8956a9d..261af7a 100644
--- a/repository_test.go
+++ b/repository_test.go
@@ -550,28 +550,6 @@ func (s *RepositorySuite) TestPlainOpenNotExistsDetectDotGit(c *C) {
c.Assert(r, IsNil)
}
-func (s *RepositorySuite) TestPlainOpenStatic(c *C) {
- dir, err := ioutil.TempDir("", "plain-open")
- c.Assert(err, IsNil)
- defer os.RemoveAll(dir)
-
- r, err := PlainInit(dir, true)
- c.Assert(err, IsNil)
- c.Assert(r, NotNil)
-
- op := &PlainOpenOptions{
- Storage: storer.Options{Static: true},
- }
-
- r, err = PlainOpenWithOptions(dir, op)
- c.Assert(err, IsNil)
- c.Assert(r, NotNil)
-
- sto, ok := r.Storer.(*filesystem.Storage)
- c.Assert(ok, Equals, true)
- c.Assert(sto.Options.Static, Equals, true)
-}
-
func (s *RepositorySuite) TestPlainClone(c *C) {
r, err := PlainClone(c.MkDir(), false, &CloneOptions{
URL: s.GetBasicLocalRepositoryURL(),