aboutsummaryrefslogtreecommitdiffstats
path: root/plumbing/object/difftree.go
diff options
context:
space:
mode:
authorAlberto Cortés <alberto@sourced.tech>2017-03-01 17:33:15 +0100
committerAlberto Cortés <alberto@sourced.tech>2017-03-01 17:58:23 +0100
commitda704cfac743a91474baf45df226e5ec034146b0 (patch)
tree3b64c2706cc515c83dcfd66e31fc6a8cf919bb1c /plumbing/object/difftree.go
parent09e4358e03e5eccf5597be9bdcd3ffeab7618fb2 (diff)
downloadgo-git-da704cfac743a91474baf45df226e5ec034146b0.tar.gz
replace os.FileMode use with filemode.FileMode
Diffstat (limited to 'plumbing/object/difftree.go')
-rw-r--r--plumbing/object/difftree.go11
1 files changed, 4 insertions, 7 deletions
diff --git a/plumbing/object/difftree.go b/plumbing/object/difftree.go
index e6e0cb0..bcc78ad 100644
--- a/plumbing/object/difftree.go
+++ b/plumbing/object/difftree.go
@@ -2,8 +2,8 @@ package object
import (
"bytes"
- "os"
+ "srcd.works/go-git.v4/plumbing/filemode"
"srcd.works/go-git.v4/utils/merkletrie"
"srcd.works/go-git.v4/utils/merkletrie/noder"
)
@@ -49,14 +49,11 @@ func equivalentMode(a, b []byte) bool {
}
var (
- file = modeToBytes(FileMode)
- fileDeprecated = modeToBytes(FileModeDeprecated)
- // remove this by fixing plumbing.Object mode ASAP
- fileGoGit = modeToBytes(os.FileMode(0644))
+ file = filemode.Regular.Bytes()
+ fileDeprecated = filemode.Deprecated.Bytes()
)
func isFilish(b []byte) bool {
return bytes.Equal(b, file) ||
- bytes.Equal(b, fileDeprecated) ||
- bytes.Equal(b, fileGoGit)
+ bytes.Equal(b, fileDeprecated)
}