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

uninit: Fix a small bug that left a lock file in .git/annex

Browse source 
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:
Joey Hess 2021-03-01 13:05:47 -04:00
parent 9835fa5d01
commit a8b627d82b
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG
View file

@ -1,6 +1,7 @@
git-annex (8.20210224) UNRELEASED; urgency=medium git-annex (8.20210224) UNRELEASED; urgency=medium
* Windows: Correct the path to the html help file for 64 bit build. * Windows: Correct the path to the html help file for 64 bit build.
* uninit: Fix a small bug that left a lock file in .git/annex
-- Joey Hess <id@joeyh.name> Wed, 24 Feb 2021 13:18:38 -0400 -- Joey Hess <id@joeyh.name> Wed, 24 Feb 2021 13:18:38 -0400

2
Command/Uninit.hs
View file

@ -13,6 +13,7 @@ import qualified Git
import qualified Git.Command import qualified Git.Command
import qualified Command.Unannex import qualified Command.Unannex
import qualified Annex.Branch import qualified Annex.Branch
import qualified Annex.Queue
import qualified Database.Keys import qualified Database.Keys
import Annex.Content import Annex.Content
import Annex.Init import Annex.Init
@ -65,6 +66,7 @@ startCheckIncomplete file _ = giveup $ unlines
finish :: Annex () finish :: Annex ()
finish = do finish = do
Annex.Queue.flush
annexdir <- fromRawFilePath <$> fromRepo gitAnnexDir annexdir <- fromRawFilePath <$> fromRepo gitAnnexDir
annexobjectdir <- fromRepo gitAnnexObjectDir annexobjectdir <- fromRepo gitAnnexObjectDir
leftovers <- removeUnannexed =<< listKeys InAnnex leftovers <- removeUnannexed =<< listKeys InAnnex