diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-05-11 16:03:50 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-05-11 16:05:01 -0400 |
| commit | 54c524f1660e40e4b302279c7571cf2f9c9d5488 (patch) | |
| tree | 6d0f7f20c7b0f8e0d175715c2b495e7a4b0b25ce /Types | |
| parent | 60dfbb240d4db6cb1a6f8ca9cf71400d461d8aa5 (diff) | |
de-Maybe remoteGitConfig
It's always set, so does not need to be a Maybe.
Diffstat (limited to 'Types')
| -rw-r--r-- | Types/GitConfig.hs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Types/GitConfig.hs b/Types/GitConfig.hs index 714038070..f66136cb1 100644 --- a/Types/GitConfig.hs +++ b/Types/GitConfig.hs @@ -88,6 +88,7 @@ data GitConfig = GitConfig , receiveDenyCurrentBranch :: DenyCurrentBranch , gcryptId :: Maybe String , gpgCmd :: GpgCmd + , gitConfigRepo :: Git.Repo } extractGitConfig :: Git.Repo -> GitConfig @@ -148,6 +149,7 @@ extractGitConfig r = GitConfig , receiveDenyCurrentBranch = getDenyCurrentBranch r , gcryptId = getmaybe "core.gcrypt-id" , gpgCmd = mkGpgCmd (getmaybe "gpg.program") + , gitConfigRepo = r } where getbool k d = fromMaybe d $ getmaybebool k @@ -216,7 +218,7 @@ data RemoteGitConfig = RemoteGitConfig , remoteAnnexHookType :: Maybe String , remoteAnnexExternalType :: Maybe String {- A regular git remote's git repository config. -} - , remoteGitConfig :: Maybe GitConfig + , remoteGitConfig :: GitConfig } extractRemoteGitConfig :: Git.Repo -> String -> RemoteGitConfig @@ -252,7 +254,7 @@ extractRemoteGitConfig r remotename = RemoteGitConfig , remoteAnnexDdarRepo = getmaybe "ddarrepo" , remoteAnnexHookType = notempty $ getmaybe "hooktype" , remoteAnnexExternalType = notempty $ getmaybe "externaltype" - , remoteGitConfig = Nothing + , remoteGitConfig = extractGitConfig r } where getbool k d = fromMaybe d $ getmaybebool k |