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

flush queue before cleaning cruft

Browse source 
Else, queued file stages won't have reached the index, and it won't find
everthing.

This evidently fixes a reversion in my work today, although I don't see how
I broke it. It didn't use to flush the queue first, before, and worked
somehow.

Test suite for v5 is back to 100% green now.
This commit is contained in:
Joey Hess 2015-12-29 17:35:57 -04:00
parent f3be28eedc
commit 5057fffccd
Failed to extract signature
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Annex/AutoMerge.hs
View file

@ -111,10 +111,10 @@ resolveMerge us them = do
void $ liftIO cleanup2 void $ liftIO cleanup2
when merged $ do when merged $ do
Annex.Queue.flush
unlessM isDirect $ do unlessM isDirect $ do
unstagedmap <- inodeMap $ inRepo $ LsFiles.notInRepo False [top] unstagedmap <- inodeMap $ inRepo $ LsFiles.notInRepo False [top]
cleanConflictCruft mergedks' mergedfs' unstagedmap cleanConflictCruft mergedks' mergedfs' unstagedmap
Annex.Queue.flush
showLongNote "Merge conflict was automatically resolved; you may want to examine the result." showLongNote "Merge conflict was automatically resolved; you may want to examine the result."
return merged return merged