uninit: Fix a small bug that left a lock file in .git/annex
unannex using git queue caused the queue lock to be taken after uninit had cleaned out .git/annex. Flush the queue earlier to avoid.
This commit is contained in:
parent
9835fa5d01
commit
a8b627d82b
2 changed files with 3 additions and 0 deletions
|
@ -13,6 +13,7 @@ import qualified Git
|
|||
import qualified Git.Command
|
||||
import qualified Command.Unannex
|
||||
import qualified Annex.Branch
|
||||
import qualified Annex.Queue
|
||||
import qualified Database.Keys
|
||||
import Annex.Content
|
||||
import Annex.Init
|
||||
|
@ -65,6 +66,7 @@ startCheckIncomplete file _ = giveup $ unlines
|
|||
|
||||
finish :: Annex ()
|
||||
finish = do
|
||||
Annex.Queue.flush
|
||||
annexdir <- fromRawFilePath <$> fromRepo gitAnnexDir
|
||||
annexobjectdir <- fromRepo gitAnnexObjectDir
|
||||
leftovers <- removeUnannexed =<< listKeys InAnnex
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue