diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-11-09 14:30:26 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-11-09 14:30:26 -0400 |
| commit | e6b3d6d722f2185ceca9150cbf6eadf1e1a10066 (patch) | |
| tree | 2ccaf745b9ef2c02788d68059d0c94d429a273fc | |
| parent | a33edddcae62eec75f3058577690413904af9386 (diff) | |
clean up cruft left in log by bug
| -rw-r--r-- | Logs/UUIDBased.hs | 5 | ||||
| -rw-r--r-- | doc/bugs/git_annex_describe_can_break_uuid.log.mdwn | 9 |
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]] |