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

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

3
Backend/Hash.hs
View file

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

2
CHANGELOG
View file

@ -2,6 +2,8 @@ git-annex (8.20200310) UNRELEASED; urgency=medium
* webdav: Made exporttree remotes faster by caching connection to the * webdav: Made exporttree remotes faster by caching connection to the
server. 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 * Fix a minor bug that caused options provided with -c to be passed
multiple times to git. multiple times to git.

7
doc/forum/Git-annex_fsck_backend_warning/comment_2_a5415299d07283f393319b37ba9335ff._comment Normal file
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.
"""]]