May be unlocked files pulled from elsewhere, but converting from direct
mode will add more. So, do the scan for them first, since it empties
anything currently in the database.
This commit is contained in:
Joey Hess 2016-01-01 15:15:15 -04:00
parent f36f24197a
commit e9a33088e8
Failed to extract signature

View file

@ -28,6 +28,7 @@ upgrade :: Bool -> Annex Bool
upgrade automatic = do
unless automatic $
showAction "v5 to v6"
Database.Keys.scanAssociatedFiles
whenM isDirect $ do
{- Direct mode makes the same tradeoff of using less disk
- space, with less preservation of old versions of files
@ -49,7 +50,6 @@ upgrade automatic = do
showLongNote "Changes have been staged for all annexed files in this repository; you should run `git commit` to commit these changes."
showLongNote "Any other clones of this repository that use direct mode need to be upgraded now, too."
configureSmudgeFilter
Database.Keys.scanAssociatedFiles
-- Inode sentinal file was only used in direct mode and when
-- locking down files as they were added. In v6, it's used more
-- extensively, so make sure it exists, since old repos that didn't