diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-03-29 12:43:47 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-03-29 12:43:47 -0400 |
| commit | 17f62aeadafec7944bdbb7803a869f9b971c6204 (patch) | |
| tree | 094309badf52c347734c083dd16f990fc33b43b0 | |
| parent | ac139ec68950deaf15732ea9353ef0396e0d440c (diff) | |
When a http remote does not expose an annex.uuid config, only warn about it once, not every time git-annex is run.
Same behavior as for a ssh remote.
| -rw-r--r-- | CHANGELOG | 5 | ||||
| -rw-r--r-- | Remote/Git.hs | 9 | ||||
| -rw-r--r-- | doc/bugs/http_git_remote_uuid_discovery_repeated.mdwn | 2 |
3 files changed, 8 insertions, 8 deletions
@@ -1,8 +1,9 @@ git-annex (6.20170322) UNRELEASED; urgency=medium - * stack.yaml: Update to lts-8.6. + * When a http remote does not expose an annex.uuid config, only warn + about it once, not every time git-annex is run. - -- Joey Hess <id@joeyh.name> Mon, 27 Mar 2017 19:48:31 -0400 + -- Joey Hess <id@joeyh.name> Wed, 29 Mar 2017 12:41:46 -0400 git-annex (6.20170321) unstable; urgency=medium diff --git a/Remote/Git.hs b/Remote/Git.hs index e5d85d2c2..78213f4f7 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -248,18 +248,15 @@ tryGitConfigRead autoinit r , return Nothing ) case v of - Nothing -> do - warning $ "Failed to get annex.uuid configuration of repository " ++ Git.repoDescribe r - return r - Just (Left _) -> do - set_ignore "not usable by git-annex" False - return r Just (Right r') -> do -- Cache when http remote is not bare for -- optimisation. unless (Git.Config.isBare r') $ setremote setRemoteBare False return r' + _ -> do + set_ignore "not usable by git-annex" False + return r store = observe $ \r' -> do g <- gitRepo diff --git a/doc/bugs/http_git_remote_uuid_discovery_repeated.mdwn b/doc/bugs/http_git_remote_uuid_discovery_repeated.mdwn index a15899654..7b3aa03c4 100644 --- a/doc/bugs/http_git_remote_uuid_discovery_repeated.mdwn +++ b/doc/bugs/http_git_remote_uuid_discovery_repeated.mdwn @@ -1,3 +1,5 @@ When cloning eg <https://github.com/datalad/ds000114>, each time git-annex is run, it tries to get the uuid, fails, prints a warning. It should set annex-ignore instead, so that only happens once. --[[Joey]] + +> [[fixed|done]] --[[Joey]] |