move keys db closure to AutoMerge

This makes git-annex sync also do it, which makes sure that the keys db
info is fresh when doing a sync --content.

Annex/AutoMerge.hs

@@ -52,8 +52,15 @@ autoMergeFrom branch currbranch mergeconfig commitmode = do
   where
 	go old = ifM isDirect
 		( mergeDirect currbranch old branch (resolveMerge old branch False) mergeconfig commitmode
-		, inRepo (Git.Merge.merge branch mergeconfig commitmode)
-			<||> (resolveMerge old branch False <&&> commitResolvedMerge commitmode)
+		, do
+			r <- inRepo (Git.Merge.merge branch mergeconfig commitmode)
+				<||> (resolveMerge old branch False <&&> commitResolvedMerge commitmode)
+			-- Merging can cause new associated files to appear
+			-- and the smudge filter will add them to the database.
+			-- To ensure that this process sees those changes,
+			-- close the database if it was open.
+			Database.Keys.closeDb
+			return r
 		)
 
 {- Resolves a conflicted merge. It's important that any conflicts be

Assistant/Threads/Merger.hs

@@ -19,7 +19,6 @@ import qualified Annex.Branch
 import qualified Git
 import qualified Git.Branch
 import qualified Command.Sync
-import qualified Database.Keys
 import Annex.TaggedPush
 import Remote (remoteFromUUID)
 
@@ -90,12 +89,6 @@ onChange file
 					currbranch mergeConfig
 					Git.Branch.AutomaticCommit
 					changedbranch
-				-- Merging can cause new associated files
-				-- to appear and the smudge filter will
-				-- add them to the database. To ensure that
-				-- this process sees those changes, close
-				-- the database if it was open.
-				liftAnnex $ Database.Keys.closeDb
 	mergecurrent _ = noop
 
 	handleDesynced = case fromTaggedBranch changedbranch of