diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-27 17:38:06 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-27 17:38:06 -0400 |
| commit | df81023501e2b0d930ec90cc6f5a6c6735f84818 (patch) | |
| tree | 5bd3b9d8f91464bd27c9d86f700b975a76067147 /Types/GitConfig.hs | |
| parent | 1e07d61b9669f85a02551d7858177bd33ffaea6f (diff) | |
Repository tuning parameters can now be passed when initializing a repository for the first time.
* init: Repository tuning parameters can now be passed when initializing a
repository for the first time. For details, see
http://git-annex.branchable.com/tuning/
* merge: Refuse to merge changes from a git-annex branch of a repo
that has been tuned in incompatable ways.
Diffstat (limited to 'Types/GitConfig.hs')
| -rw-r--r-- | Types/GitConfig.hs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Types/GitConfig.hs b/Types/GitConfig.hs index ef8068cc4..5ac524f45 100644 --- a/Types/GitConfig.hs +++ b/Types/GitConfig.hs @@ -20,6 +20,7 @@ import Config.Cost import Types.Distribution import Types.Availability import Types.NumCopies +import Types.Difference import Utility.HumanTime {- Main git-annex settings. Each setting corresponds to a git-config key @@ -56,6 +57,7 @@ data GitConfig = GitConfig , annexHardLink :: Bool , coreSymlinks :: Bool , gcryptId :: Maybe String + , annexDifferences :: Differences } extractGitConfig :: Git.Repo -> GitConfig @@ -93,6 +95,7 @@ extractGitConfig r = GitConfig , annexHardLink = getbool (annex "hardlink") False , coreSymlinks = getbool "core.symlinks" True , gcryptId = getmaybe "core.gcrypt-id" + , annexDifferences = getDifferences r } where getbool k def = fromMaybe def $ getmaybebool k |