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

Remove debug output (to stderr)

Browse source 
Accidentially included in last version. Only happens when running code that
uses remoteUrl.
This commit is contained in:
Joey Hess 2024-08-02 14:13:29 -04:00
parent 83fa76733f
commit c34d1da22a
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG
View file

@ -1,6 +1,8 @@
git-annex (10.20240732) UNRELEASED; urgency=medium git-annex (10.20240732) UNRELEASED; urgency=medium
* Avoid loading cluster log at startup. * Avoid loading cluster log at startup.
* Remove debug output (to stderr) accidentially included in
last version.
-- Joey Hess <id@joeyh.name> Wed, 31 Jul 2024 15:52:03 -0400 -- Joey Hess <id@joeyh.name> Wed, 31 Jul 2024 15:52:03 -0400

13
Types/GitConfig.hs
View file

@ -29,8 +29,6 @@ module Types.GitConfig (
mkRemoteConfigKey, mkRemoteConfigKey,
) where ) where
import Debug.Trace
import Common import Common
import qualified Git import qualified Git
import qualified Git.Config import qualified Git.Config
@ -495,12 +493,11 @@ extractRemoteGitConfig r remotename = do
, remoteAnnexClusterGateway = fromMaybe [] $ , remoteAnnexClusterGateway = fromMaybe [] $
(mapMaybe (mkClusterUUID . toUUID) . words) (mapMaybe (mkClusterUUID . toUUID) . words)
<$> getmaybe ClusterGatewayField <$> getmaybe ClusterGatewayField
, remoteUrl = traceShow (mkRemoteConfigKey remotename (remoteGitConfigKey UrlField)) $ , remoteUrl = case Git.Config.getMaybe (mkRemoteConfigKey remotename (remoteGitConfigKey UrlField)) r of
case Git.Config.getMaybe (mkRemoteConfigKey remotename (remoteGitConfigKey UrlField)) r of Just (ConfigValue b)
Just (ConfigValue b) | B.null b -> Nothing
| B.null b -> Nothing | otherwise -> Just (decodeBS b)
| otherwise -> Just (decodeBS b) _ -> Nothing
_ -> Nothing
, remoteAnnexP2PHttpUrl = , remoteAnnexP2PHttpUrl =
case Git.Config.getMaybe (mkRemoteConfigKey remotename (remoteGitConfigKey AnnexUrlField)) r of case Git.Config.getMaybe (mkRemoteConfigKey remotename (remoteGitConfigKey AnnexUrlField)) r of
Just (ConfigValue b) -> Just (ConfigValue b) ->