mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

limit git annex adjust to v6 mode

Browse source 
doesn't work in v5
This commit is contained in:
Joey Hess 2016-03-29 12:05:02 -04:00
parent f4dd3fbb68
commit 5e1d7bbc00
Failed to extract signature
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Annex/Version.hs
View file

@ -52,6 +52,9 @@ versionSupportsUnlockedPointers = go <$> getVersion
go (Just "6") = True go (Just "6") = True
go _ = False go _ = False
versionSupportsAdjustedBranch :: Annex Bool
versionSupportsAdjustedBranch = versionSupportsUnlockedPointers
setVersion :: Version -> Annex () setVersion :: Version -> Annex ()
setVersion = setConfig versionField setVersion = setConfig versionField

3
Command/Adjust.hs
View file

@ -9,6 +9,7 @@ module Command.Adjust where
import Command import Command
import Annex.AdjustedBranch import Annex.AdjustedBranch
import Annex.Version
cmd :: Command cmd :: Command
cmd = notBareRepo $ notDirect $ cmd = notBareRepo $ notDirect $
@ -33,5 +34,7 @@ seek = commandAction . start
start :: Adjustment -> CommandStart start :: Adjustment -> CommandStart
start adj = do start adj = do
unlessM versionSupportsAdjustedBranch $
error "Adjusted branches are only supported in v6 or newer repositories."
enterAdjustedBranch adj enterAdjustedBranch adj
next $ next $ return True next $ next $ return True