mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

--allow-unrelated-histories will be in git 2.9.0, not 2.8.2

Browse source 
Also, I had the logic backwards in the version comparison.
This commit is contained in:
Joey Hess 2016-04-27 13:54:46 -04:00
parent 7f3137f408
commit a3a0ab77df
Failed to extract signature
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Git/Merge.hs
View file

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