refactor isBareRepo

This commit is contained in:
Joey Hess 2016-06-02 16:59:15 -04:00
parent c8dd196234
commit 26887745a0
Failed to extract signature
4 changed files with 7 additions and 9 deletions

View file

@ -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