diff options
Diffstat (limited to 'Command/Uninit.hs')
| -rw-r--r-- | Command/Uninit.hs | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/Command/Uninit.hs b/Command/Uninit.hs index a40e28399..3fbe6758a 100644 --- a/Command/Uninit.hs +++ b/Command/Uninit.hs @@ -11,7 +11,6 @@ import Common.Annex import Command import qualified Git import qualified Git.Command -import qualified Annex import qualified Command.Unannex import Init import qualified Annex.Branch @@ -38,7 +37,7 @@ check = do seek :: [CommandSeek] seek = [ withFilesNotInGit $ whenAnnexed startCheckIncomplete - , withFilesInGit $ whenAnnexed startUnannex + , withFilesInGit $ whenAnnexed Command.Unannex.start , withNothing start ] @@ -51,14 +50,6 @@ startCheckIncomplete file _ = error $ unlines , "Not continuing with uninit; either delete or git annex add the file and retry." ] -startUnannex :: FilePath -> (Key, Backend) -> CommandStart -startUnannex file info = do - -- Force fast mode before running unannex. This way, if multiple - -- files link to a key, it will be left in the annex and hardlinked - -- to by each. - Annex.changeState $ \s -> s { Annex.fast = True } - Command.Unannex.start file info - start :: CommandStart start = next $ next $ do annexdir <- fromRepo gitAnnexDir |