diff options
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/Add.hs | 8 | ||||
| -rw-r--r-- | Command/Uninit.hs | 4 | ||||
| -rw-r--r-- | Command/Unused.hs | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Command/Add.hs b/Command/Add.hs index 9410601b8..944525ea5 100644 --- a/Command/Add.hs +++ b/Command/Add.hs @@ -82,9 +82,11 @@ cleanup file key hascontent = do -- touch the symlink to have the same mtime as the -- file it points to - liftIO $ do - mtime <- modificationTime <$> getFileStatus file - touch file (TimeSpec mtime) False + -- XXX Currently broken on non-utf8 locales when + -- dealing with utf-8 filenames. + --liftIO $ do + --mtime <- modificationTime <$> getFileStatus file + --touch file (TimeSpec mtime) False force <- Annex.getState Annex.force if force diff --git a/Command/Uninit.hs b/Command/Uninit.hs index 878547bc3..d6283a77d 100644 --- a/Command/Uninit.hs +++ b/Command/Uninit.hs @@ -7,8 +7,6 @@ module Command.Uninit where -import qualified Data.Text.Lazy as L - import Common.Annex import Command import qualified Git @@ -29,7 +27,7 @@ check = do when (b == Annex.Branch.name) $ error $ "cannot uninit when the " ++ show b ++ " branch is checked out" where - current_branch = Git.Ref . Prelude.head . lines . L.unpack <$> revhead + current_branch = Git.Ref . Prelude.head . lines <$> revhead revhead = inRepo $ Git.Command.pipeRead [Params "rev-parse --abbrev-ref HEAD"] diff --git a/Command/Unused.hs b/Command/Unused.hs index 67f743ab0..1c82b9ae4 100644 --- a/Command/Unused.hs +++ b/Command/Unused.hs @@ -162,7 +162,7 @@ excludeReferenced l = do refs = map (Git.Ref . snd) . nubBy uniqref . filter ourbranches . - map (separate (== ' ')) . lines . L.unpack + map (separate (== ' ')) . lines uniqref (a, _) (b, _) = a == b ourbranchend = '/' : show Annex.Branch.name ourbranches (_, b) = not $ ourbranchend `isSuffixOf` b |