aboutsummaryrefslogtreecommitdiff
path: root/Command/Uninit.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-12-14 15:56:11 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-12-14 15:56:11 -0400
commitef28b3fef7e236d8c27ce35308c0e37ece58d20c (patch)
tree346b40aaffcdb2ad5220741d9b9546821d07c4c9 /Command/Uninit.hs
parent02f1bd2bf47d3ff49a222e9428ec27708ef55f64 (diff)
split out Git/Command.hs
Diffstat (limited to 'Command/Uninit.hs')
-rw-r--r--Command/Uninit.hs6
1 files changed, 4 insertions, 2 deletions
diff --git a/Command/Uninit.hs b/Command/Uninit.hs
index 48f5b1ac1..fc6f0cc27 100644
--- a/Command/Uninit.hs
+++ b/Command/Uninit.hs
@@ -12,6 +12,7 @@ import qualified Data.ByteString.Lazy.Char8 as B
import Common.Annex
import Command
import qualified Git
+import qualified Git.Command
import qualified Annex
import qualified Command.Unannex
import Init
@@ -29,7 +30,7 @@ check = do
"cannot uninit when the " ++ show b ++ " branch is checked out"
where
current_branch = Git.Ref . head . lines . B.unpack <$> revhead
- revhead = inRepo $ Git.pipeRead
+ revhead = inRepo $ Git.Command.pipeRead
[Params "rev-parse --abbrev-ref HEAD"]
seek :: [CommandSeek]
@@ -57,5 +58,6 @@ cleanup = do
liftIO $ removeDirectoryRecursive annexdir
-- avoid normal shutdown
saveState
- inRepo $ Git.run "branch" [Param "-D", Param $ show Annex.Branch.name]
+ inRepo $ Git.Command.run "branch"
+ [Param "-D", Param $ show Annex.Branch.name]
liftIO exitSuccess