summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Logs/UUIDBased.hs5
-rw-r--r--doc/bugs/git_annex_describe_can_break_uuid.log.mdwn9
2 files changed, 9 insertions, 5 deletions
diff --git a/Logs/UUIDBased.hs b/Logs/UUIDBased.hs
index c1901eef7..10b3bf55d 100644
--- a/Logs/UUIDBased.hs
+++ b/Logs/UUIDBased.hs
@@ -63,6 +63,11 @@ parseLogWithUUID :: (UUID -> String -> Maybe a) -> String -> Log a
parseLogWithUUID parser = M.fromListWith best . mapMaybe parse . lines
where
parse line
+ -- This is a workaround for a bug that caused
+ -- NoUUID items to be stored in the log.
+ -- It can be removed at any time; is just here to clean
+ -- up logs where that happened temporarily.
+ | " " `isPrefixOf` line = Nothing
| null ws = Nothing
| otherwise = parser u (unwords info) >>= makepair
where
diff --git a/doc/bugs/git_annex_describe_can_break_uuid.log.mdwn b/doc/bugs/git_annex_describe_can_break_uuid.log.mdwn
index e00f508b3..16e6981f5 100644
--- a/doc/bugs/git_annex_describe_can_break_uuid.log.mdwn
+++ b/doc/bugs/git_annex_describe_can_break_uuid.log.mdwn
@@ -40,8 +40,7 @@ $ git cat-file blob git-annex:uuid.log
"""]]
> Fixed the bug and made git breakage not crash git-annex. [[done]]
->
-> You will probably end up with `git annex info` (used to be `git annex
-> status`) showing a strange display for "b". Just running "git annex dead
-> b" will clean that up. (You'd not want to do this if b is an active git
-> remote.) --[[Joey]]
+> --[[Joey]]
+
+> > Update: Also made it automatically clean up the cruft this put in the
+> > log. --[[Joey]]