diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-03-29 12:05:02 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-29 12:05:02 -0400 |
| commit | d88340524510e82c4fce59f33f64d8e25031ae9e (patch) | |
| tree | 1934b21a4fae949610a1dfee49c331a7816cde70 | |
| parent | 3b7202cb47f89547e09f6fd219d73c88d4e52bc6 (diff) | |
limit git annex adjust to v6 mode
doesn't work in v5
| -rw-r--r-- | Annex/Version.hs | 3 | ||||
| -rw-r--r-- | Command/Adjust.hs | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Annex/Version.hs b/Annex/Version.hs index f294f8cd3..b5f038c0d 100644 --- a/Annex/Version.hs +++ b/Annex/Version.hs @@ -52,6 +52,9 @@ versionSupportsUnlockedPointers = go <$> getVersion go (Just "6") = True go _ = False +versionSupportsAdjustedBranch :: Annex Bool +versionSupportsAdjustedBranch = versionSupportsUnlockedPointers + setVersion :: Version -> Annex () setVersion = setConfig versionField diff --git a/Command/Adjust.hs b/Command/Adjust.hs index 7646cfa57..2ea39edd2 100644 --- a/Command/Adjust.hs +++ b/Command/Adjust.hs @@ -9,6 +9,7 @@ module Command.Adjust where import Command import Annex.AdjustedBranch +import Annex.Version cmd :: Command cmd = notBareRepo $ notDirect $ @@ -33,5 +34,7 @@ seek = commandAction . start start :: Adjustment -> CommandStart start adj = do + unlessM versionSupportsAdjustedBranch $ + error "Adjusted branches are only supported in v6 or newer repositories." enterAdjustedBranch adj next $ next $ return True |