fix test suite when git is too old to understand --allow-unrelated-histories

This commit is contained in:
Joey Hess 2019-03-22 13:47:16 -04:00
parent 06cbaa4233
commit b6a3d0ae10
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 16 additions and 6 deletions

View file

@ -10,6 +10,7 @@ module Git.Merge (
CommitMode(..),
merge,
merge',
mergeUnrelatedHistoriesParam,
stageMerge,
) where
@ -44,15 +45,21 @@ merge' extraparams branch mergeconfig commitmode r
merge'' :: [CommandParam] -> [MergeConfig] -> Repo -> IO Bool
merge'' ps mergeconfig r
| MergeUnrelatedHistories `elem` mergeconfig =
ifM (Git.Version.older "2.9.0")
( go ps
, go (ps ++ [Param "--allow-unrelated-histories"])
)
| MergeUnrelatedHistories `elem` mergeconfig = do
up <- mergeUnrelatedHistoriesParam
go (ps ++ maybeToList up)
| otherwise = go ps
where
go ps' = runBool ps' r
{- Git used to default to merging unrelated histories; newer versions need
- an option. -}
mergeUnrelatedHistoriesParam :: IO (Maybe CommandParam)
mergeUnrelatedHistoriesParam = ifM (Git.Version.older "2.9.0")
( return Nothing
, return (Just (Param "--allow-unrelated-histories"))
)
{- Stage the merge into the index, but do not commit it.-}
stageMerge :: Ref -> [MergeConfig] -> Repo -> IO Bool
stageMerge branch = merge''