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

6
Git/Merge.hs
View file

@ -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