diff options
Diffstat (limited to 'Annex')
-rw-r--r-- | Annex/Branch.hs | 4 | ||||
-rw-r--r-- | Annex/UUID.hs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Annex/Branch.hs b/Annex/Branch.hs index af29b02b0..5482dc44b 100644 --- a/Annex/Branch.hs +++ b/Annex/Branch.hs @@ -29,8 +29,8 @@ module Annex.Branch ( import qualified Data.ByteString.Lazy as L import qualified Data.Set as S import qualified Data.Map as M -import Data.Bits.Utils import Data.Function +import Data.Char import Control.Concurrent (threadDelay) import Annex.Common @@ -304,7 +304,7 @@ commitIndex' jl branchref message basemessage retrynum parents = do -- look for "parent ref" lines and return the refs commitparents = map (Git.Ref . snd) . filter isparent . map (toassoc . decodeBS) . L.split newline - newline = c2w8 '\n' + newline = fromIntegral (ord '\n') toassoc = separate (== ' ') isparent (k,_) = k == "parent" diff --git a/Annex/UUID.hs b/Annex/UUID.hs index 0e87cda59..8a2d88427 100644 --- a/Annex/UUID.hs +++ b/Annex/UUID.hs @@ -37,7 +37,7 @@ import Config import qualified Data.UUID as U import qualified Data.UUID.V4 as U4 import qualified Data.UUID.V5 as U5 -import Data.Bits.Utils +import Utility.FileSystemEncoding configkey :: ConfigKey configkey = annexConfig "uuid" |