When initializing a v6 repo on a crippled filesystem, don't force it into direct mode.

This commit is contained in:
Joey Hess 2016-02-15 15:41:49 -04:00
parent 6021538332
commit 2e3b5e645f
Failed to extract signature
2 changed files with 3 additions and 1 deletions

View file

@ -91,7 +91,7 @@ initialize' mversion = do
whenM versionSupportsUnlockedPointers $ do whenM versionSupportsUnlockedPointers $ do
configureSmudgeFilter configureSmudgeFilter
Database.Keys.scanAssociatedFiles Database.Keys.scanAssociatedFiles
ifM (crippledFileSystem <&&> not <$> isBare) ifM (crippledFileSystem <&&> (not <$> isBare) <&&> (not <$> versionSupportsUnlockedPointers))
( do ( do
enableDirectMode enableDirectMode
setDirect True setDirect True

2
debian/changelog vendored
View file

@ -11,6 +11,8 @@ git-annex (6.20160212) UNRELEASED; urgency=medium
* fsck: Detect and fix missing associated file mappings in v6 repositories. * fsck: Detect and fix missing associated file mappings in v6 repositories.
* fsck: Populate unlocked files in v6 repositories whose content is * fsck: Populate unlocked files in v6 repositories whose content is
present in annex/objects but didn't reach the work tree. present in annex/objects but didn't reach the work tree.
* When initializing a v6 repo on a crippled filesystem, don't force it
into direct mode.
-- Joey Hess <id@joeyh.name> Fri, 12 Feb 2016 14:03:46 -0400 -- Joey Hess <id@joeyh.name> Fri, 12 Feb 2016 14:03:46 -0400