diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-04-22 12:29:32 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-04-22 12:29:32 -0400 |
| commit | 8ac4cd6904ca80a6d115f3ce2ade66495a77a45f (patch) | |
| tree | 88610a8e4c8b5f71568f230d8e6303bc389c4a5e /Test.hs | |
| parent | e896c249fa876cbf6f281ce9e934bde6cb92e345 (diff) | |
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.
Diffstat (limited to 'Test.hs')
| -rw-r--r-- | Test.hs | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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 |