diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-05-10 13:03:56 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-05-10 13:03:56 -0400 |
| commit | ae8a630b3cfac9ed3ea8c3137619e13ee021071e (patch) | |
| tree | 4c28656ee3a81c09b99cfee48844069a7958908b /Types | |
| parent | ce8dcc753490e2a51cf86005944a5255520059cf (diff) | |
Added annex.gnupg-decrypt-options and remote.<name>.annex-gnupg-decrypt-options, which are passed to gpg when it's decrypting data.
The naming is unofrtunately not consistent, but the gnupg-options
were only used for encrypting, and it's too late to change that.
It would be nice to have a third setting that is always passed to gnupg,
but ~/.gnupg/options can be used to specify such global options when really
needed.
Diffstat (limited to 'Types')
| -rw-r--r-- | Types/GitConfig.hs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Types/GitConfig.hs b/Types/GitConfig.hs index b5e3d795e..33f102e1d 100644 --- a/Types/GitConfig.hs +++ b/Types/GitConfig.hs @@ -162,6 +162,7 @@ data RemoteGitConfig = RemoteGitConfig , remoteAnnexRsyncDownloadOptions :: [String] , remoteAnnexRsyncTransport :: [String] , remoteAnnexGnupgOptions :: [String] + , remoteAnnexGnupgDecryptOptions :: [String] , remoteAnnexRsyncUrl :: Maybe String , remoteAnnexBupRepo :: Maybe String , remoteAnnexTahoe :: Maybe FilePath @@ -196,6 +197,7 @@ extractRemoteGitConfig r remotename = RemoteGitConfig , remoteAnnexRsyncUploadOptions = getoptions "rsync-upload-options" , remoteAnnexRsyncTransport = getoptions "rsync-transport" , remoteAnnexGnupgOptions = getoptions "gnupg-options" + , remoteAnnexGnupgDecryptOptions = getoptions "gnupg-decrypt-options" , remoteAnnexRsyncUrl = notempty $ getmaybe "rsyncurl" , remoteAnnexBupRepo = getmaybe "buprepo" , remoteAnnexTahoe = getmaybe "tahoe" |