better avoid switching to direct mode in clone of adjusted branch repo

This commit is contained in:
Joey Hess 2016-06-02 15:58:22 -04:00
parent 1dcfd797fa
commit 3b97c09cde
Failed to extract signature
2 changed files with 27 additions and 18 deletions

View file

@ -93,20 +93,23 @@ initialize' mversion = do
whenM versionSupportsUnlockedPointers $ do
configureSmudgeFilter
Database.Keys.scanAssociatedFiles
whenM checkAdjustedClone $
void $ upgrade True
ifM (crippledFileSystem <&&> (not <$> isBare))
( ifM versionSupportsUnlockedPointers
( adjustToCrippledFileSystem
, do
enableDirectMode
setDirect True
)
-- Handle case where this repo was cloned from a
-- direct mode repo
, unlessM isBare
switchHEADBack
)
v <- checkAdjustedClone
case v of
NeedUpgradeForAdjustedClone -> void $ upgrade True
InAdjustedClone -> return ()
NotInAdjustedClone ->
ifM (crippledFileSystem <&&> (not <$> isBare))
( ifM versionSupportsUnlockedPointers
( adjustToCrippledFileSystem
, do
enableDirectMode
setDirect True
)
-- Handle case where this repo was cloned from a
-- direct mode repo
, unlessM isBare
switchHEADBack
)
createInodeSentinalFile False
uninitialize :: Annex ()