diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-03-03 13:39:07 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-03-03 13:39:07 -0400 |
| commit | 9bce151df7b073c5f2507ea15ca2237814ae9248 (patch) | |
| tree | 653751d0c0f70475fc1bd7e89d0465fa76b8c630 /Git/Branch.hs | |
| parent | e4fc1c290dba197a16c0e1cc0ff07ecfe2ee542b (diff) | |
git subcommand cleanup
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.
Diffstat (limited to 'Git/Branch.hs')
| -rw-r--r-- | Git/Branch.hs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Git/Branch.hs b/Git/Branch.hs index 736c4c6e8..41ae2559e 100644 --- a/Git/Branch.hs +++ b/Git/Branch.hs @@ -73,8 +73,7 @@ fastForward branch (first:rest) repo = where no_ff = return False do_ff to = do - run "update-ref" - [Param $ show branch, Param $ show to] repo + run [Param "update-ref", Param $ show branch, Param $ show to] repo return True findbest c [] = return $ Just c findbest c (r:rs) @@ -97,7 +96,7 @@ commit message branch parentrefs repo = do sha <- getSha "commit-tree" $ pipeWriteRead (map Param $ ["commit-tree", show tree] ++ ps) message repo - run "update-ref" [Param $ show branch, Param $ show sha] repo + run [Param "update-ref", Param $ show branch, Param $ show sha] repo return sha where ps = concatMap (\r -> ["-p", show r]) parentrefs |