diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-02-15 15:41:49 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-02-15 15:41:49 -0400 |
| commit | d1a98f9d0be87de0c031c66b2329d78309e03303 (patch) | |
| tree | 1e36c67c158e948838e3c88ce7171ac3a2b8d2aa | |
| parent | 7eb83f6f712606d13b4083affff19126d9fb0f75 (diff) | |
When initializing a v6 repo on a crippled filesystem, don't force it into direct mode.
| -rw-r--r-- | Annex/Init.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Annex/Init.hs b/Annex/Init.hs index ece6e3a31..2391549fb 100644 --- a/Annex/Init.hs +++ b/Annex/Init.hs @@ -91,7 +91,7 @@ initialize' mversion = do whenM versionSupportsUnlockedPointers $ do configureSmudgeFilter Database.Keys.scanAssociatedFiles - ifM (crippledFileSystem <&&> not <$> isBare) + ifM (crippledFileSystem <&&> (not <$> isBare) <&&> (not <$> versionSupportsUnlockedPointers)) ( do enableDirectMode setDirect True diff --git a/debian/changelog b/debian/changelog index b93d7ba91..ad9f3b672 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ git-annex (6.20160212) UNRELEASED; urgency=medium * fsck: Detect and fix missing associated file mappings in v6 repositories. * fsck: Populate unlocked files in v6 repositories whose content is 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 |