diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-09-24 17:25:47 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-09-24 17:25:47 -0400 |
| commit | e06bf0da75294b33188cde319c29d93266fd4bb3 (patch) | |
| tree | d8c409e1b9ad3d060e1bb5b80ed2e101e1d43c21 /Types/GitConfig.hs | |
| parent | a7f9ddb8de7c1e0357046d3dc9efc644bd5fb730 (diff) | |
git-annex-shell: Added support for operating inside gcrypt repositories.
* Note that the layout of gcrypt repositories has changed, and
if you created one you must manually upgrade it.
See http://git-annex.branchable.com/upgrades/gcrypt/
Diffstat (limited to 'Types/GitConfig.hs')
| -rw-r--r-- | Types/GitConfig.hs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Types/GitConfig.hs b/Types/GitConfig.hs index 4f2e91331..5db38e68f 100644 --- a/Types/GitConfig.hs +++ b/Types/GitConfig.hs @@ -42,6 +42,7 @@ data GitConfig = GitConfig , annexCrippledFileSystem :: Bool , annexLargeFiles :: Maybe String , coreSymlinks :: Bool + , gcryptId :: Maybe String } extractGitConfig :: Git.Repo -> GitConfig @@ -68,6 +69,7 @@ extractGitConfig r = GitConfig , annexCrippledFileSystem = getbool (annex "crippledfilesystem") False , annexLargeFiles = getmaybe (annex "largefiles") , coreSymlinks = getbool "core.symlinks" True + , gcryptId = getmaybe "core.gcrypt-id" } where get k def = fromMaybe def $ getmayberead k @@ -104,6 +106,7 @@ data RemoteGitConfig = RemoteGitConfig , remoteAnnexBupRepo :: Maybe String , remoteAnnexBupSplitOptions :: [String] , remoteAnnexDirectory :: Maybe FilePath + , remoteAnnexGCrypt :: Maybe String , remoteAnnexHookType :: Maybe String {- A regular git remote's git repository config. -} , remoteGitConfig :: Maybe GitConfig @@ -127,6 +130,7 @@ extractRemoteGitConfig r remotename = RemoteGitConfig , remoteAnnexBupRepo = getmaybe "buprepo" , remoteAnnexBupSplitOptions = getoptions "bup-split-options" , remoteAnnexDirectory = notempty $ getmaybe "directory" + , remoteAnnexGCrypt = notempty $ getmaybe "gcrypt" , remoteAnnexHookType = notempty $ getmaybe "hooktype" , remoteGitConfig = Nothing } |