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

move keys db closure to AutoMerge

Browse source 
This makes git-annex sync also do it, which makes sure that the keys db
info is fresh when doing a sync --content.
This commit is contained in:
Joey Hess 2016-05-16 15:11:14 -04:00
parent 0860731760
commit 4efc26ca6c
Failed to extract signature
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Annex/AutoMerge.hs
View file

@ -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