From a8b627d82b871500589821e4c9a87eb7b79b8b39 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 1 Mar 2021 13:05:47 -0400 Subject: [PATCH] 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. --- CHANGELOG | 1 + Command/Uninit.hs | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index d7767bd387..67890fdf38 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ git-annex (8.20210224) UNRELEASED; urgency=medium * 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 Wed, 24 Feb 2021 13:18:38 -0400 diff --git a/Command/Uninit.hs b/Command/Uninit.hs index 3f648ec8a0..ac206594ed 100644 --- a/Command/Uninit.hs +++ b/Command/Uninit.hs @@ -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