diff options
author | Joey Hess <joey@kitenet.net> | 2011-12-14 15:56:11 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2011-12-14 15:56:11 -0400 |
commit | ef28b3fef7e236d8c27ce35308c0e37ece58d20c (patch) | |
tree | 346b40aaffcdb2ad5220741d9b9546821d07c4c9 /Annex | |
parent | 02f1bd2bf47d3ff49a222e9428ec27708ef55f64 (diff) |
split out Git/Command.hs
Diffstat (limited to 'Annex')
-rw-r--r-- | Annex/Branch.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Annex/Branch.hs b/Annex/Branch.hs index a22a4adcf..af1878479 100644 --- a/Annex/Branch.hs +++ b/Annex/Branch.hs @@ -24,6 +24,7 @@ import Annex.Exception import Annex.BranchState import Annex.Journal import qualified Git +import qualified Git.Command import qualified Git.Ref import qualified Git.Branch import qualified Git.UnionMerge @@ -67,7 +68,7 @@ getBranch :: Annex (Git.Ref) getBranch = maybe (hasOrigin >>= go >>= use) (return) =<< branchsha where go True = do - inRepo $ Git.run "branch" + inRepo $ Git.Command.run "branch" [Param $ show name, Param $ show originname] fromMaybe (error $ "failed to create " ++ show name) <$> branchsha @@ -221,7 +222,7 @@ commitBranch branchref message parents = do {- Lists all files on the branch. There may be duplicates in the list. -} files :: Annex [FilePath] files = withIndexUpdate $ do - bfiles <- inRepo $ Git.pipeNullSplit + bfiles <- inRepo $ Git.Command.pipeNullSplit [Params "ls-tree --name-only -r -z", Param $ show fullname] jfiles <- getJournalledFiles return $ jfiles ++ bfiles |