diff options
| author | Máximo Cuadros <mcuadros@gmail.com> | 2017-07-19 01:26:16 +0200 |
|---|---|---|
| committer | Máximo Cuadros <mcuadros@gmail.com> | 2017-07-19 01:26:16 +0200 |
| commit | 8210c82bcd6ff7f7c66b8f5fc1be00307fe59c42 (patch) | |
| tree | 8b6fbb9401c43133dfac280eb36ea49df6d26e10 /utils/merkletrie/filesystem | |
| parent | acb1a5f7a47e4759bbe1592a0a58571bda6289e7 (diff) | |
| download | go-git-8210c82bcd6ff7f7c66b8f5fc1be00307fe59c42.tar.gz | |
utils: merkletrie filesystem based on path, and not in filepath
Diffstat (limited to 'utils/merkletrie/filesystem')
| -rw-r--r-- | utils/merkletrie/filesystem/node.go | 6 | ||||
| -rw-r--r-- | utils/merkletrie/filesystem/node_test.go | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/utils/merkletrie/filesystem/node.go b/utils/merkletrie/filesystem/node.go index a8f3b86..f763e08 100644 --- a/utils/merkletrie/filesystem/node.go +++ b/utils/merkletrie/filesystem/node.go @@ -3,7 +3,7 @@ package filesystem import ( "io" "os" - "path/filepath" + "path" "gopkg.in/src-d/go-billy.v3" "gopkg.in/src-d/go-git.v4/plumbing" @@ -53,7 +53,7 @@ func (n *node) Hash() []byte { } func (n *node) Name() string { - return filepath.Base(n.path) + return path.Base(n.path) } func (n *node) IsDir() bool { @@ -107,7 +107,7 @@ func (n *node) calculateChildren() error { } func (n *node) newChildNode(file os.FileInfo) (*node, error) { - path := filepath.Join(n.path, file.Name()) + path := path.Join(n.path, file.Name()) hash, err := n.calculateHash(path, file) if err != nil { diff --git a/utils/merkletrie/filesystem/node_test.go b/utils/merkletrie/filesystem/node_test.go index 6d764ab..42dd82e 100644 --- a/utils/merkletrie/filesystem/node_test.go +++ b/utils/merkletrie/filesystem/node_test.go @@ -4,7 +4,7 @@ import ( "bytes" "io" "os" - "path/filepath" + "path" "testing" . "gopkg.in/check.v1" @@ -134,7 +134,7 @@ func (s *NoderSuite) TestDiffChangeModeNotRelevant(c *C) { } func (s *NoderSuite) TestDiffDirectory(c *C) { - dir := filepath.Join("qux", "bar") + dir := path.Join("qux", "bar") fsA := memfs.New() fsA.MkdirAll(dir, 0644) |