From 8ac4cd6904ca80a6d115f3ce2ade66495a77a45f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 22 Apr 2016 12:29:32 -0400 Subject: adjusted branches need git 2.2.0 or newer When git-annex is used with a git version older than 2.2.0, disable support for adjusted branches, since GIT_COMMON_DIR is needed to update them and was first added in that version of git. --- Test.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Test.hs') diff --git a/Test.hs b/Test.hs index a98a3df3b..3bd627957 100644 --- a/Test.hs +++ b/Test.hs @@ -72,6 +72,7 @@ import qualified Annex.Link import qualified Annex.Init import qualified Annex.CatFile import qualified Annex.Path +import qualified Annex.AdjustedBranch import qualified Annex.View import qualified Annex.View.ViewedFile import qualified Logs.View @@ -1048,7 +1049,7 @@ test_conflict_resolution = {- Conflict resolution while in an adjusted branch. -} test_conflict_resolution_adjusted_branch :: Assertion -test_conflict_resolution_adjusted_branch = +test_conflict_resolution_adjusted_branch = whenM Annex.AdjustedBranch.isGitVersionSupported $ withtmpclonerepo $ \r1 -> withtmpclonerepo $ \r2 -> do indir r1 $ do -- cgit v1.2.3