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

forget --drop-dead: Avoid removing the dead remote from the trust.log, so that if git remotes for it still exist anywhere, git annex info will still know it's dead and not show it.

Browse source
This commit is contained in:
Joey Hess 2014-03-26 13:28:26 -04:00
parent 2940fa1ba2
commit 0df4848a9e
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Annex/Branch/Transitions.hs
View file

@ -32,8 +32,12 @@ getTransitionCalculator ForgetDeadRemotes = Just dropDead
dropDead :: FilePath -> String -> TrustMap -> FileTransition dropDead :: FilePath -> String -> TrustMap -> FileTransition
dropDead f content trustmap = case getLogVariety f of dropDead f content trustmap = case getLogVariety f of
Just UUIDBasedLog -> ChangeFile $ Just UUIDBasedLog
UUIDBased.showLog id $ dropDeadFromUUIDBasedLog trustmap $ UUIDBased.parseLog Just content -- Don't remove the dead repo from the trust log,
-- because git remotes may still exist, and they need
-- to still know it's dead.
| f == trustLog -> PreserveFile
| otherwise -> ChangeFile $ UUIDBased.showLog id $ dropDeadFromUUIDBasedLog trustmap $ UUIDBased.parseLog Just content
Just NewUUIDBasedLog -> ChangeFile $ Just NewUUIDBasedLog -> ChangeFile $
UUIDBased.showLogNew id $ dropDeadFromUUIDBasedLog trustmap $ UUIDBased.parseLogNew Just content UUIDBased.showLogNew id $ dropDeadFromUUIDBasedLog trustmap $ UUIDBased.parseLogNew Just content
Just (PresenceLog _) -> Just (PresenceLog _) ->

3
debian/changelog vendored
View file

@ -12,6 +12,9 @@ git-annex (5.20140321) UNRELEASED; urgency=medium
* tahoe: Pass -d parameter before subcommand; putting it after * tahoe: Pass -d parameter before subcommand; putting it after
the subcommand no longer works with tahoe-lafs version 1.10. the subcommand no longer works with tahoe-lafs version 1.10.
(Thanks, Alberto Berti) (Thanks, Alberto Berti)
* forget --drop-dead: Avoid removing the dead remote from the trust.log,
so that if git remotes for it still exist anywhere, git annex info
will still know it's dead and not show it.
-- Joey Hess <joeyh@debian.org> Fri, 21 Mar 2014 14:08:41 -0400 -- Joey Hess <joeyh@debian.org> Fri, 21 Mar 2014 14:08:41 -0400

2
doc/bugs/__96__git_annex_forget_--drop-dead_--force__96_____95__revives__95___repositories.mdwn
View file

@ -84,3 +84,5 @@ Debian GNU/Linux 7 \n \l
richih@apu (git)-[master] /srv/video/video.debian.net % richih@apu (git)-[master] /srv/video/video.debian.net %
"""]] """]]
> [[fixed|done]] via not removing from trust.log --[[Joey]]