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 /Command/Adjust.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 'Command/Adjust.hs')
| -rw-r--r-- | Command/Adjust.hs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Command/Adjust.hs b/Command/Adjust.hs index e2850a361..addc652db 100644 --- a/Command/Adjust.hs +++ b/Command/Adjust.hs @@ -9,7 +9,6 @@ module Command.Adjust where import Command import Annex.AdjustedBranch -import Annex.Version cmd :: Command cmd = notBareRepo $ notDirect $ noDaemonRunning $ @@ -34,8 +33,7 @@ seek = commandAction . start start :: Adjustment -> CommandStart start adj = do - unlessM versionSupportsAdjustedBranch $ - error "Adjusted branches are only supported in v6 or newer repositories." + checkVersionSupported showStart "adjust" "" enterAdjustedBranch adj next $ next $ return True |