diff options
-rw-r--r-- | Remote/Git.hs | 11 | ||||
-rw-r--r-- | debian/changelog | 3 | ||||
-rw-r--r-- | doc/bugs/prematurely___40__can__39__t_check_offline__41___marks_remote_as_annex-ignore.mdwn | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs index a0992957c..627a6066b 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -233,14 +233,17 @@ tryGitConfigRead autoinit r hClose h let url = Git.repoLocation r ++ "/config" ifM (Url.downloadQuiet url tmpfile uo) - ( pipedconfig "git" [Param "config", Param "--null", Param "--list", Param "--file", File tmpfile] - , return $ Left $ error $ "unable to load config from " ++ url + ( Just <$> pipedconfig "git" [Param "config", Param "--null", Param "--list", Param "--file", File tmpfile] + , return Nothing ) 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 return r - Right r' -> do + Just (Right r') -> do -- Cache when http remote is not bare for -- optimisation. unless (Git.Config.isBare r') $ diff --git a/debian/changelog b/debian/changelog index 22ff0c5ca..8a84656d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ git-annex (6.20160420) UNRELEASED; urgency=medium * Fix bug that sometimes prevented git-annex smudge --clean from consuming all its input, which resulted in git add bypassing git-annex. * 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 diff --git a/doc/bugs/prematurely___40__can__39__t_check_offline__41___marks_remote_as_annex-ignore.mdwn b/doc/bugs/prematurely___40__can__39__t_check_offline__41___marks_remote_as_annex-ignore.mdwn index 1884dd9d3..41e573dda 100644 --- a/doc/bugs/prematurely___40__can__39__t_check_offline__41___marks_remote_as_annex-ignore.mdwn +++ b/doc/bugs/prematurely___40__can__39__t_check_offline__41___marks_remote_as_annex-ignore.mdwn @@ -25,3 +25,5 @@ git-annex: get: 1 failed """]] [[!meta author=yoh]] + +> [[fixed|done]] --[[Joey]] |