summaryrefslogtreecommitdiff
path: root/Annex
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-01-01 15:09:42 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-01-01 15:09:42 -0400
commitb106df45110320f24bbcd972f10f47192efbadd8 (patch)
treeb62f5f51e3b1d6394b91c19144c2d5e17db5a28d /Annex
parent797afd300cde42488a1c64201289165c48a9208e (diff)
scan for unlocked files on init/upgrade of v6 repo
Diffstat (limited to 'Annex')
-rw-r--r--Annex/Init.hs6
1 files changed, 4 insertions, 2 deletions
diff --git a/Annex/Init.hs b/Annex/Init.hs
index 99bb03e92..9cb876284 100644
--- a/Annex/Init.hs
+++ b/Annex/Init.hs
@@ -1,6 +1,6 @@
{- git-annex repository initialization
-
- - Copyright 2011 Joey Hess <id@joeyh.name>
+ - Copyright 2011-2016 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
@@ -36,6 +36,7 @@ import Annex.Environment
import Annex.Hook
import Annex.InodeSentinal
import Upgrade
+import qualified Database.Keys
#ifndef mingw32_HOST_OS
import Utility.UserInfo
import Utility.FileMode
@@ -87,8 +88,9 @@ initialize' mversion = do
setDifferences
unlessM (isJust <$> getVersion) $
setVersion (fromMaybe defaultVersion mversion)
- whenM versionSupportsUnlockedPointers
+ whenM versionSupportsUnlockedPointers $ do
configureSmudgeFilter
+ Database.Keys.scanAssociatedFiles
ifM (crippledFileSystem <&&> not <$> isBare)
( do
enableDirectMode