From a3a0ab77df4327a4cccf379eff64b6b640bdbff4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 27 Apr 2016 13:54:46 -0400 Subject: [PATCH] --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 +++--- debian/changelog | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Git/Merge.hs b/Git/Merge.hs index 76ea35ddd5..a0767e462e 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 f19b7141ec..e536c5029b 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