diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-01-01 15:15:15 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-01-01 15:15:15 -0400 |
| commit | cf8d7fa046cf66a4ac75b9d56b48776891b65863 (patch) | |
| tree | 7599db6a12baa6dd27c16246130bbcc6be651ab1 /Upgrade | |
| parent | b106df45110320f24bbcd972f10f47192efbadd8 (diff) | |
reorder
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.
Diffstat (limited to 'Upgrade')
| -rw-r--r-- | Upgrade/V5.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Upgrade/V5.hs b/Upgrade/V5.hs index 83a68ed4e..8e567b425 100644 --- a/Upgrade/V5.hs +++ b/Upgrade/V5.hs @@ -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 |