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

Improve behavior when a just added http remote is not available during uuid probe. Do not mark it as annex-ignore, so it will be tried again later.

Browse source
This commit is contained in:
Joey Hess 2016-05-03 12:53:42 -04:00
parent 157993dd2f
commit bfb4095c13
Failed to extract signature
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Remote/Git.hs
View file

@ -233,14 +233,17 @@ tryGitConfigRead autoinit r
hClose h hClose h
let url = Git.repoLocation r ++ "/config" let url = Git.repoLocation r ++ "/config"
ifM (Url.downloadQuiet url tmpfile uo) ifM (Url.downloadQuiet url tmpfile uo)
( pipedconfig "git" [Param "config", Param "--null", Param "--list", Param "--file", File tmpfile] ( Just <$> pipedconfig "git" [Param "config", Param "--null", Param "--list", Param "--file", File tmpfile]
, return $ Left $ error $ "unable to load config from " ++ url , return Nothing
) )
case v of case v of
Left _ -> do 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 set_ignore "not usable by git-annex" False
return r return r
Right r' -> do Just (Right r') -> do
-- Cache when http remote is not bare for -- Cache when http remote is not bare for
-- optimisation. -- optimisation.
unless (Git.Config.isBare r') $ unless (Git.Config.isBare r') $

3
debian/changelog vendored
View file

@ -3,6 +3,9 @@ git-annex (6.20160420) UNRELEASED; urgency=medium
* Fix bug that sometimes prevented git-annex smudge --clean from consuming * Fix bug that sometimes prevented git-annex smudge --clean from consuming
all its input, which resulted in git add bypassing git-annex. all its input, which resulted in git add bypassing git-annex.
* Fix build with directory-1.2.6.2. * Fix build with directory-1.2.6.2.
* Improve behavior when a just added http remote is not available
during uuid probe. Do not mark it as annex-ignore, so it will be tried
again later.
-- Joey Hess <id@joeyh.name> Thu, 28 Apr 2016 13:17:04 -0400 -- Joey Hess <id@joeyh.name> Thu, 28 Apr 2016 13:17:04 -0400

2
doc/bugs/prematurely___40__can__39__t_check_offline__41___marks_remote_as_annex-ignore.mdwn
View file

@ -25,3 +25,5 @@ git-annex: get: 1 failed
"""]] """]]
[[!meta author=yoh]] [[!meta author=yoh]]
> [[fixed|done]] --[[Joey]]