From 9d53e1cddffd96ccc496bb3aa1457d033af2aad7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Feb 2019 13:20:24 -0400 Subject: [PATCH] add a missing import --- Annex/Fixup.hs | 3 ++- Annex/Init.hs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Annex/Fixup.hs b/Annex/Fixup.hs index 16fce9b54a..416ccbaf0f 100644 --- a/Annex/Fixup.hs +++ b/Annex/Fixup.hs @@ -11,6 +11,7 @@ import Git.Types import Git.Config import Types.GitConfig import Config.Files +import qualified Git import qualified Git.BuildVersion import Utility.Path 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 } } | otherwise = r - notnoannex = isNothing <$> noAnnexFileContent (repoWorkTree r) + notnoannex = isNothing <$> noAnnexFileContent (Git.repoWorkTree r) fixupUnusualRepos r _ = return r needsSubmoduleFixup :: Repo -> Bool diff --git a/Annex/Init.hs b/Annex/Init.hs index 6030332648..5d72b19816 100644 --- a/Annex/Init.hs +++ b/Annex/Init.hs @@ -53,7 +53,7 @@ import qualified Utility.LockFile.Posix as Posix #endif checkCanInitialize :: Annex a -> Annex a -checkCanInitialize a = inRepo (noAnnexFileContent . repoWorkTree) >>= \case +checkCanInitialize a = inRepo (noAnnexFileContent . Git.repoWorkTree) >>= \case Nothing -> a Just noannexmsg -> do warning "Initialization prevented by .noannex file (remove the file to override)"