fix a couple warnings
This commit is contained in:
parent
770b8ff926
commit
a51a479fb9
3 changed files with 3 additions and 6 deletions
|
@ -14,7 +14,6 @@ import Annex.Content
|
||||||
import qualified Annex
|
import qualified Annex
|
||||||
import qualified Annex.Queue
|
import qualified Annex.Queue
|
||||||
import qualified Database.Keys
|
import qualified Database.Keys
|
||||||
import Config
|
|
||||||
import Annex.FileMatcher
|
import Annex.FileMatcher
|
||||||
import Annex.Link
|
import Annex.Link
|
||||||
import Annex.Version
|
import Annex.Version
|
||||||
|
|
|
@ -56,10 +56,10 @@ wrapUnannex a = ifM versionSupportsUnlockedPointers
|
||||||
]
|
]
|
||||||
cleanindex = ifM (inRepo Git.Ref.headExists)
|
cleanindex = ifM (inRepo Git.Ref.headExists)
|
||||||
( do
|
( do
|
||||||
(diff, cleanup) <- inRepo $ DiffTree.diffIndex Git.Ref.headRef
|
(diff, reap) <- inRepo $ DiffTree.diffIndex Git.Ref.headRef
|
||||||
if null diff
|
if null diff
|
||||||
then void (liftIO cleanup) >> return True
|
then void (liftIO reap) >> return True
|
||||||
else void (liftIO cleanup) >> return False
|
else void (liftIO reap) >> return False
|
||||||
, return False
|
, return False
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -8,8 +8,6 @@
|
||||||
module Command.Undo where
|
module Command.Undo where
|
||||||
|
|
||||||
import Command
|
import Command
|
||||||
import Config
|
|
||||||
import Annex.CatFile
|
|
||||||
import Git.DiffTree
|
import Git.DiffTree
|
||||||
import Git.FilePath
|
import Git.FilePath
|
||||||
import Git.UpdateIndex
|
import Git.UpdateIndex
|
||||||
|
|
Loading…
Reference in a new issue