mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

git subcommand cleanup

Browse source 
Pass subcommand as a regular param, which allows passing git parameters
like -c before it. This was already done in the pipeing set of functions,
but not the command running set.
This commit is contained in:
Joey Hess 2013-03-03 13:39:07 -04:00
parent 3a783b4a3a
commit 0c13d3065e
20 changed files with 95 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Upgrade/V2.hs
View file

@ -54,7 +54,7 @@ upgrade = do
showProgress
when e $ do
inRepo $ Git.Command.run "rm" [Param "-r", Param "-f", Param "-q", File old]
inRepo $ Git.Command.run [Param "rm", Param "-r", Param "-f", Param "-q", File old]
unless bare $ inRepo gitAttributesUnWrite
showProgress
@ -105,8 +105,8 @@ push = do
Annex.Branch.update -- just in case
showAction "pushing new git-annex branch to origin"
showOutput
inRepo $ Git.Command.run "push"
[Param "origin", Param $ show Annex.Branch.name]
inRepo $ Git.Command.run
[Param "push", Param "origin", Param $ show Annex.Branch.name]
_ -> do
-- no origin exists, so just let the user
-- know about the new branch
@ -129,7 +129,7 @@ gitAttributesUnWrite repo = do
c <- readFileStrict attributes
liftIO $ viaTmp writeFile attributes $ unlines $
filter (`notElem` attrLines) $ lines c
Git.Command.run "add" [File attributes] repo
Git.Command.run [Param "add", File attributes] repo
stateDir :: FilePath
stateDir = addTrailingPathSeparator ".git-annex"