fsck: Fix reversion in 8.20200226 that made it incorrectly warn that hashed keys with an extension should be upgraded.

This commit is contained in:
Joey Hess 2020-03-20 13:09:16 -04:00
parent 6222277179
commit bbe977a2b6
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 11 additions and 1 deletions

View file

@ -157,7 +157,8 @@ keyHash = fst . splitKeyNameExtension
validInExtension :: Word8 -> Bool
validInExtension c
| isAlphaNum (chr (fromIntegral c)) = True
| c <= 127 = False -- other ascii, spaces, punctuation, control chars
| fromIntegral c == ord '.' = True
| c <= 127 = False -- other ascii: spaces, punctuation, control chars
| otherwise = True -- utf8 is allowed, also other encodings
{- Upgrade keys that have the \ prefix on their hash due to a bug, or

View file

@ -2,6 +2,8 @@ git-annex (8.20200310) UNRELEASED; urgency=medium
* webdav: Made exporttree remotes faster by caching connection to the
server.
* fsck: Fix reversion in 8.20200226 that made it incorrectly warn
that hashed keys with an extension should be upgraded.
* Fix a minor bug that caused options provided with -c to be passed
multiple times to git.

View file

@ -0,0 +1,7 @@
[[!comment format=mdwn
username="joey"
subject="""comment 2"""
date="2020-03-20T16:55:44Z"
content="""
Fixed in git just now.
"""]]