mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

avoid side message when doing automatic upgrade to v7

Browse source 
An automatic upgrade is supposed to be silent.
This commit is contained in:
Joey Hess 2019-08-26 13:54:52 -04:00
parent 5877a15d7b
commit f6fb4b8cdb
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Annex/Init.hs
View file

@ -113,6 +113,7 @@ initialize' mversion = checkCanInitialize $ do
) )
whenM versionSupportsUnlockedPointers $ do whenM versionSupportsUnlockedPointers $ do
configureSmudgeFilter configureSmudgeFilter
showSideAction "scanning for unlocked files"
scanUnlockedFiles True scanUnlockedFiles True
unlessM isBareRepo $ do unlessM isBareRepo $ do
hookWrite postCheckoutHook hookWrite postCheckoutHook

1
Annex/WorkTree.hs
View file

@ -80,7 +80,6 @@ ifAnnexed file yes no = maybe no yes =<< lookupFile file
-} -}
scanUnlockedFiles :: Bool -> Annex () scanUnlockedFiles :: Bool -> Annex ()
scanUnlockedFiles replacefiles = whenM (inRepo Git.Ref.headExists) $ do scanUnlockedFiles replacefiles = whenM (inRepo Git.Ref.headExists) $ do
showSideAction "scanning for unlocked files"
Database.Keys.runWriter $ Database.Keys.runWriter $
liftIO . Database.Keys.SQL.dropAllAssociatedFiles liftIO . Database.Keys.SQL.dropAllAssociatedFiles
(l, cleanup) <- inRepo $ Git.LsTree.lsTree Git.LsTree.LsTreeRecursive Git.Ref.headRef (l, cleanup) <- inRepo $ Git.LsTree.lsTree Git.LsTree.LsTreeRecursive Git.Ref.headRef