diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-04-27 13:54:46 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-04-27 13:54:46 -0400 |
| commit | 1f9cf1bf452a1edceb9f3b36d2e5b6083703b1a4 (patch) | |
| tree | 917889d6b424bf5049b3a91f6d8979cf30d85631 | |
| parent | 87d953fd2f2b40c24eb4c796f0e78a2399fc9020 (diff) | |
--allow-unrelated-histories will be in git 2.9.0, not 2.8.2
Also, I had the logic backwards in the version comparison.
| -rw-r--r-- | Git/Merge.hs | 6 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 4 insertions, 4 deletions
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 diff --git a/debian/changelog b/debian/changelog index f19b7141e..e536c5029 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,7 +14,7 @@ git-annex (6.20160419) UNRELEASED; urgency=medium to refer to a file. * Fix bug that prevented annex.sshcaching=false configuration from taking 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 together repositories with unrelated histories, work around this behavior change when the assistant merges, by passing |