diff --git a/CHANGELOG b/CHANGELOG index 0495ba4ff2..8eaef2da4b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ git-annex (10.20240732) UNRELEASED; urgency=medium * Avoid loading cluster log at startup. + * Remove debug output (to stderr) accidentially included in + last version. * Remotes configured with exporttree=yes annexobjects=yes can store objects in .git/annex/objects, as well as an exported tree. * git-remote-annex: Store objects in exportree=yes special remotes diff --git a/Types/GitConfig.hs b/Types/GitConfig.hs index 93f1737717..68ce298d02 100644 --- a/Types/GitConfig.hs +++ b/Types/GitConfig.hs @@ -29,8 +29,6 @@ module Types.GitConfig ( mkRemoteConfigKey, ) where -import Debug.Trace - import Common import qualified Git import qualified Git.Config @@ -495,12 +493,11 @@ extractRemoteGitConfig r remotename = do , remoteAnnexClusterGateway = fromMaybe [] $ (mapMaybe (mkClusterUUID . toUUID) . words) <$> getmaybe ClusterGatewayField - , remoteUrl = traceShow (mkRemoteConfigKey remotename (remoteGitConfigKey UrlField)) $ - case Git.Config.getMaybe (mkRemoteConfigKey remotename (remoteGitConfigKey UrlField)) r of - Just (ConfigValue b) - | B.null b -> Nothing - | otherwise -> Just (decodeBS b) - _ -> Nothing + , remoteUrl = case Git.Config.getMaybe (mkRemoteConfigKey remotename (remoteGitConfigKey UrlField)) r of + Just (ConfigValue b) + | B.null b -> Nothing + | otherwise -> Just (decodeBS b) + _ -> Nothing , remoteAnnexP2PHttpUrl = case Git.Config.getMaybe (mkRemoteConfigKey remotename (remoteGitConfigKey AnnexUrlField)) r of Just (ConfigValue b) -> diff --git a/doc/todo/exporttree_remotes_could_store_any_key.mdwn b/doc/todo/exporttree_remotes_could_store_any_key.mdwn index 5a9c20881b..701330e515 100644 --- a/doc/todo/exporttree_remotes_could_store_any_key.mdwn +++ b/doc/todo/exporttree_remotes_could_store_any_key.mdwn @@ -77,3 +77,7 @@ exporttree=yes special remote R. So, when calling removeExport, have to also check if the key is present in the objects location. If so, either don't record the key as missing, or also remove from the objects location. + +--- + +Implementing in the "exportreeplus" branch --[[Joey]] diff --git a/doc/todo/git-annex_proxies.mdwn b/doc/todo/git-annex_proxies.mdwn index 1628677465..93730e383c 100644 --- a/doc/todo/git-annex_proxies.mdwn +++ b/doc/todo/git-annex_proxies.mdwn @@ -30,7 +30,8 @@ Planned schedule of work: ## work notes -* release time +* Working on `exportreeplus` branch which is groundwork for proxying to + exporttree=yes special remotes. ## items deferred until later for p2p protocol over http