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

--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'' :: [CommandParam] -> [MergeConfig] -> Repo -> IO Bool
merge'' ps mergeconfig r merge'' ps mergeconfig r
| MergeUnrelatedHistories `elem` mergeconfig = | MergeUnrelatedHistories `elem` mergeconfig =
ifM (Git.Version.older "2.8.2") ifM (Git.Version.older "2.9.0")
( go (ps ++ [Param "--allow-unrelated-histories"]) ( go ps
, go ps , go (ps ++ [Param "--allow-unrelated-histories"])
) )
| otherwise = go ps | otherwise = go ps
where where

2
debian/changelog vendored
View file

@ -14,7 +14,7 @@ git-annex (6.20160419) UNRELEASED; urgency=medium
to refer to a file. to refer to a file.
* Fix bug that prevented annex.sshcaching=false configuration from taking * Fix bug that prevented annex.sshcaching=false configuration from taking
effect when on a crippled filesystem. Thanks, divergentdave. effect when on a crippled filesystem. Thanks, divergentdave.
* git 2.8.2 is going to prevent git merge from merging in unrelated * git 2.9.0 is going to prevent git merge from merging in unrelated
branches. Since the webapp's pairing etc features often combine branches. Since the webapp's pairing etc features often combine
together repositories with unrelated histories, work around together repositories with unrelated histories, work around
this behavior change when the assistant merges, by passing this behavior change when the assistant merges, by passing