mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

de-Maybe remoteGitConfig

Browse source 
It's always set, so does not need to be a Maybe.
This commit is contained in:
Joey Hess 2017-05-11 16:03:50 -04:00
parent a6416ba232
commit db1600b2de
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
5 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Types/GitConfig.hs
View file

@ -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