mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

add a missing import

Browse source
This commit is contained in:
Joey Hess 2019-02-08 13:20:24 -04:00
parent 6cba1950f2
commit 9d53e1cddf
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Annex/Fixup.hs
View file

@ -11,6 +11,7 @@ import Git.Types
import Git.Config import Git.Config
import Types.GitConfig import Types.GitConfig
import Config.Files import Config.Files
import qualified Git
import qualified Git.BuildVersion import qualified Git.BuildVersion
import Utility.Path import Utility.Path
import Utility.SafeCommand import Utility.SafeCommand
@ -141,7 +142,7 @@ fixupUnusualRepos r@(Repo { location = l@(Local { worktree = Just w, gitdir = d
| coreSymlinks c = r { location = l { gitdir = dotgit } } | coreSymlinks c = r { location = l { gitdir = dotgit } }
| otherwise = r | otherwise = r
notnoannex = isNothing <$> noAnnexFileContent (repoWorkTree r) notnoannex = isNothing <$> noAnnexFileContent (Git.repoWorkTree r)
fixupUnusualRepos r _ = return r fixupUnusualRepos r _ = return r
needsSubmoduleFixup :: Repo -> Bool needsSubmoduleFixup :: Repo -> Bool

2
Annex/Init.hs
View file

@ -53,7 +53,7 @@ import qualified Utility.LockFile.Posix as Posix
#endif #endif
checkCanInitialize :: Annex a -> Annex a checkCanInitialize :: Annex a -> Annex a
checkCanInitialize a = inRepo (noAnnexFileContent . repoWorkTree) >>= \case checkCanInitialize a = inRepo (noAnnexFileContent . Git.repoWorkTree) >>= \case
Nothing -> a Nothing -> a
Just noannexmsg -> do Just noannexmsg -> do
warning "Initialization prevented by .noannex file (remove the file to override)" warning "Initialization prevented by .noannex file (remove the file to override)"