summaryrefslogtreecommitdiff
path: root/Upgrade
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 /Upgrade
parent02f1bd2bf47d3ff49a222e9428ec27708ef55f64 (diff)
split out Git/Command.hs
Diffstat (limited to 'Upgrade')
-rw-r--r--Upgrade/V2.hs8
1 files changed, 5 insertions, 3 deletions
diff --git a/Upgrade/V2.hs b/Upgrade/V2.hs
index 3440d504b..ffc2f6002 100644
--- a/Upgrade/V2.hs
+++ b/Upgrade/V2.hs
@@ -9,6 +9,7 @@ module Upgrade.V2 where
import Common.Annex
import qualified Git
+import qualified Git.Command
import qualified Git.Ref
import qualified Annex.Branch
import Logs.Location
@@ -53,7 +54,7 @@ upgrade = do
showProgress
when e $ do
- inRepo $ Git.run "rm" [Param "-r", Param "-f", Param "-q", File old]
+ inRepo $ Git.Command.run "rm" [Param "-r", Param "-f", Param "-q", File old]
unless bare $ inRepo gitAttributesUnWrite
showProgress
@@ -104,7 +105,8 @@ push = do
Annex.Branch.update -- just in case
showAction "pushing new git-annex branch to origin"
showOutput
- inRepo $ Git.run "push" [Param "origin", Param $ show Annex.Branch.name]
+ inRepo $ Git.Command.run "push"
+ [Param "origin", Param $ show Annex.Branch.name]
_ -> do
-- no origin exists, so just let the user
-- know about the new branch
@@ -127,7 +129,7 @@ gitAttributesUnWrite repo = do
c <- readFileStrict attributes
liftIO $ viaTmp writeFile attributes $ unlines $
filter (`notElem` attrLines) $ lines c
- Git.run "add" [File attributes] repo
+ Git.Command.run "add" [File attributes] repo
stateDir :: FilePath
stateDir = addTrailingPathSeparator ".git-annex"