git-annex 7.20200226 → 7.20200309
raw patch · 4 files changed
+13/−5 lines, 4 files
Files
- CHANGELOG +7/−0
- Remote/External.hs +2/−2
- Types/RemoteConfig.hs +3/−2
- git-annex.cabal +1/−1
CHANGELOG view
@@ -1,3 +1,10 @@+git-annex (7.20200309) upstream; urgency=medium++ * Fix regression that prevented external special remotes from using+ GETCONFIG to query values like "name". (Introduced in version 7.20200202.7.)++ -- Joey Hess <id@joeyh.name> Mon, 09 Mar 2020 12:40:28 -0400+ git-annex (7.20200226) upstream; urgency=high * Fix serious regression in gcrypt and encrypted git-lfs remotes.
Remote/External.hs view
@@ -420,9 +420,9 @@ modifyTVar' (externalConfigChanges st) $ \f -> f . M.insert (Accepted setting) (Accepted value) handleRemoteRequest (GETCONFIG setting) = do- value <- fromMaybe ""+ value <- maybe "" fromProposedAccepted . (M.lookup (Accepted setting))- . getRemoteConfigPassedThrough+ . unparsedRemoteConfig <$> liftIO (atomically $ readTVar $ externalConfig st) send $ VALUE value handleRemoteRequest (SETCREDS setting login password) = case (externalUUID external, externalGitConfig external) of
Types/RemoteConfig.hs view
@@ -23,8 +23,9 @@ {- Before being used a RemoteConfig has to be parsed. -} data ParsedRemoteConfig = ParsedRemoteConfig- (M.Map RemoteConfigField RemoteConfigValue)- RemoteConfig+ { parsedRemoteConfigMap :: M.Map RemoteConfigField RemoteConfigValue+ , unparsedRemoteConfig :: RemoteConfig+ } {- Remotes can have configuration values of many types, so use Typeable - to let them all be stored in here. -}
git-annex.cabal view
@@ -1,5 +1,5 @@ Name: git-annex-Version: 7.20200226+Version: 7.20200309 Cabal-Version: >= 1.8 License: AGPL-3 Maintainer: Joey Hess <id@joeyh.name>