summaryrefslogtreecommitdiff
path: root/Annex/GitOverlay.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-04-22 12:29:32 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-04-22 12:29:32 -0400
commit8ac4cd6904ca80a6d115f3ce2ade66495a77a45f (patch)
tree88610a8e4c8b5f71568f230d8e6303bc389c4a5e /Annex/GitOverlay.hs
parente896c249fa876cbf6f281ce9e934bde6cb92e345 (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 'Annex/GitOverlay.hs')
-rw-r--r--Annex/GitOverlay.hs5
1 files changed, 4 insertions, 1 deletions
diff --git a/Annex/GitOverlay.hs b/Annex/GitOverlay.hs
index 7e18d225b..e33d8a83c 100644
--- a/Annex/GitOverlay.hs
+++ b/Annex/GitOverlay.hs
@@ -40,7 +40,10 @@ withWorkTree d = withAltRepo
- files that are related to the work tree coming from an overlay
- directory other than the usual. This is done by pointing
- GIT_COMMON_DIR at the regular git directory, and GIT_DIR at the
- - overlay directory. -}
+ - overlay directory.
+ -
+ - Needs git 2.2.0 or newer.
+ -}
withWorkTreeRelated :: FilePath -> Annex a -> Annex a
withWorkTreeRelated d = withAltRepo modrepo unmodrepo
where