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

include git-annex-shell back in

Browse source 
Also pushed ConfigKey down into the Git modules, which is the bulk of
the changes.
This commit is contained in:
Joey Hess 2019-12-02 10:57:09 -04:00
parent 65b88a0b99
commit f3047d7186
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
26 changed files with 101 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Types/GitConfig.hs
View file

@ -211,7 +211,7 @@ extractGitConfig r = GitConfig
configurable d Nothing = DefaultConfig d
configurable _ (Just v) = HasConfig v
annex k = "annex." <> k
annex k = ConfigKey $ "annex." <> k
onemegabyte = 1000000
@ -350,8 +350,9 @@ extractRemoteGitConfig r remotename = do
(Git.Config.getMaybe (remotekey k) r)
getoptions k = fromMaybe [] $ words <$> getmaybe k
key k = "annex." <> k
remotekey k = "remote." <> encodeBS' remotename <> ".annex-" <> k
key k = ConfigKey $ "annex." <> k
remotekey k = ConfigKey $
"remote." <> encodeBS' remotename <> ".annex-" <> k
notempty :: Maybe String -> Maybe String
notempty Nothing = Nothing