aboutsummaryrefslogtreecommitdiff
path: root/Annex/Init.hs
diff options
context:
space:
mode:
Diffstat (limited to 'Annex/Init.hs')
-rw-r--r--Annex/Init.hs9
1 files changed, 3 insertions, 6 deletions
diff --git a/Annex/Init.hs b/Annex/Init.hs
index f2996993a..e12a8bc80 100644
--- a/Annex/Init.hs
+++ b/Annex/Init.hs
@@ -85,7 +85,7 @@ initialize' mversion = do
checkLockSupport
checkFifoSupport
checkCrippledFileSystem
- unlessM isBare $
+ unlessM isBareRepo $
hookWrite preCommitHook
setDifferences
unlessM (isJust <$> getVersion) $
@@ -98,7 +98,7 @@ initialize' mversion = do
NeedUpgradeForAdjustedClone -> void $ upgrade True
InAdjustedClone -> return ()
NotInAdjustedClone ->
- ifM (crippledFileSystem <&&> (not <$> isBare))
+ ifM (crippledFileSystem <&&> (not <$> isBareRepo))
( ifM versionSupportsUnlockedPointers
( adjustToCrippledFileSystem
, do
@@ -107,7 +107,7 @@ initialize' mversion = do
)
-- Handle case where this repo was cloned from a
-- direct mode repo
- , unlessM isBare
+ , unlessM isBareRepo
switchHEADBack
)
createInodeSentinalFile False
@@ -137,9 +137,6 @@ ensureInitialized = getVersion >>= maybe needsinit checkUpgrade
isInitialized :: Annex Bool
isInitialized = maybe Annex.Branch.hasSibling (const $ return True) =<< getVersion
-isBare :: Annex Bool
-isBare = fromRepo Git.repoIsLocalBare
-
{- A crippled filesystem is one that does not allow making symlinks,
- or removing write access from files. -}
probeCrippledFileSystem :: Annex Bool