From 3b33e39dbd444ccada4598598abc6da40880d9e6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 16 May 2016 15:11:14 -0400 Subject: 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. --- Assistant/Threads/Merger.hs | 7 ------- 1 file changed, 7 deletions(-) (limited to 'Assistant') diff --git a/Assistant/Threads/Merger.hs b/Assistant/Threads/Merger.hs index 0080ef964..521e5bda6 100644 --- a/Assistant/Threads/Merger.hs +++ b/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 -- cgit v1.2.3