From a51a479fb9c61fcb3bff3db0aa1db118c2990758 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 27 Aug 2019 12:24:31 -0400 Subject: [PATCH] fix a couple warnings --- Command/Add.hs | 1 - Command/Unannex.hs | 6 +++--- Command/Undo.hs | 2 -- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Command/Add.hs b/Command/Add.hs index 322349378a..f219717083 100644 --- a/Command/Add.hs +++ b/Command/Add.hs @@ -14,7 +14,6 @@ import Annex.Content import qualified Annex import qualified Annex.Queue import qualified Database.Keys -import Config import Annex.FileMatcher import Annex.Link import Annex.Version diff --git a/Command/Unannex.hs b/Command/Unannex.hs index 85a82d41d5..92c3be75d4 100644 --- a/Command/Unannex.hs +++ b/Command/Unannex.hs @@ -56,10 +56,10 @@ wrapUnannex a = ifM versionSupportsUnlockedPointers ] cleanindex = ifM (inRepo Git.Ref.headExists) ( do - (diff, cleanup) <- inRepo $ DiffTree.diffIndex Git.Ref.headRef + (diff, reap) <- inRepo $ DiffTree.diffIndex Git.Ref.headRef if null diff - then void (liftIO cleanup) >> return True - else void (liftIO cleanup) >> return False + then void (liftIO reap) >> return True + else void (liftIO reap) >> return False , return False ) diff --git a/Command/Undo.hs b/Command/Undo.hs index 53ef50c9f0..8a1939394e 100644 --- a/Command/Undo.hs +++ b/Command/Undo.hs @@ -8,8 +8,6 @@ module Command.Undo where import Command -import Config -import Annex.CatFile import Git.DiffTree import Git.FilePath import Git.UpdateIndex