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/Merge.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/Merge.hs')
| -rw-r--r-- | Git/Merge.hs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Git/Merge.hs b/Git/Merge.hs index bad9f8258..e70a71d64 100644 --- a/Git/Merge.hs +++ b/Git/Merge.hs @@ -15,5 +15,7 @@ import Git.Version {- Avoids recent git's interactive merge. -} mergeNonInteractive :: Ref -> Repo -> IO Bool mergeNonInteractive branch - | older "1.7.7.6" = runBool "merge" [Param $ show branch] - | otherwise = runBool "merge" [Param "--no-edit", Param $ show branch] + | older "1.7.7.6" = merge [Param $ show branch] + | otherwise = merge [Param "--no-edit", Param $ show branch] + where + merge ps = runBool $ Param "merge" : ps |