diff --git a/Data/Git/Storage/Object.hs b/Data/Git/Storage/Object.hs index 42b77ebb09c8c562886e30068b69e5207f0680ad..90cad8d9cc88ff980a53cdd9f6d7332e85ac9b7b 100644 --- a/Data/Git/Storage/Object.hs +++ b/Data/Git/Storage/Object.hs @@ -265,7 +265,7 @@ treeWrite (Tree ents) = toLazyByteString $ mconcat $ concatMap writeTreeEnt ents where writeTreeEnt (ModePerm perm,name,ref) = [ string7 (printf "%o" perm) , string7 " " - , byteString $ toBytes name + , byteString $ getEntNameBytes name , string7 "\0" , byteString $ toBinary ref ] diff --git a/Data/Git/Types.hs b/Data/Git/Types.hs index db0b94f7f62eec664c744b7cf5e39c3ea421dbb8..dd2afe6f2ef6833f669fbe3fd4735fe69fc52840 100644 --- a/Data/Git/Types.hs +++ b/Data/Git/Types.hs @@ -19,6 +19,7 @@ module Data.Git.Types , Person(..) , EntName , entName + , getEntNameBytes , EntPath , entPathAppend -- * modeperm type @@ -40,7 +41,6 @@ module Data.Git.Types import Data.Word import Data.Bits -import Data.Byteable import Data.String import Data.ByteString (ByteString) import qualified Data.ByteString as B @@ -147,14 +147,12 @@ data FilePermissions = FilePermissions type Perm = Word8 -- | Entity name -newtype EntName = EntName ByteString +newtype EntName = EntName { getEntNameBytes :: ByteString } deriving (Eq,Ord) instance Show EntName where show (EntName e) = UTF8.toString e instance IsString EntName where fromString s = entName $ UTF8.fromString s -instance Byteable EntName where - toBytes (EntName n) = n entName :: ByteString -> EntName entName bs diff --git a/git.cabal b/git.cabal index f0ee161a19f7a7cadae08d1e3025fe23e7bdebfd..bb0466ee356ba28e3949e4e1903371881cc54fd2 100644 --- a/git.cabal +++ b/git.cabal @@ -29,7 +29,6 @@ Library Build-Depends: base >= 4 && < 5 , basement , bytestring >= 0.9 - , byteable , containers , memory >= 0.13 , cryptonite >= 0.22