From 1f9cf1bf452a1edceb9f3b36d2e5b6083703b1a4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 27 Apr 2016 13:54:46 -0400 Subject: --allow-unrelated-histories will be in git 2.9.0, not 2.8.2 Also, I had the logic backwards in the version comparison. --- Git/Merge.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Git') diff --git a/Git/Merge.hs b/Git/Merge.hs index 76ea35ddd..a0767e462 100644 --- a/Git/Merge.hs +++ b/Git/Merge.hs @@ -45,9 +45,9 @@ merge' extraparams branch mergeconfig commitmode r merge'' :: [CommandParam] -> [MergeConfig] -> Repo -> IO Bool merge'' ps mergeconfig r | MergeUnrelatedHistories `elem` mergeconfig = - ifM (Git.Version.older "2.8.2") - ( go (ps ++ [Param "--allow-unrelated-histories"]) - , go ps + ifM (Git.Version.older "2.9.0") + ( go ps + , go (ps ++ [Param "--allow-unrelated-histories"]) ) | otherwise = go ps where -- cgit v1.2.3