fsck: Fix reversion in 8.20200226 that made it incorrectly warn that hashed keys...

diff --git a/Backend/Hash.hs b/Backend/Hash.hs
index 1da11240af8aaa5e276ab0d6ddf93691b348c5a6..9ac00f8cd3142cf9b84fd14284a3605ca747a0ec 100644 (file)
--- a/Backend/Hash.hs
+++ b/Backend/Hash.hs
@@ -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

diff --git a/CHANGELOG b/CHANGELOG
index e08a365d0f6c9efd622d1df22e6754c173ee1fb4..eee9244a7720ce52ff7f461d50131edad02c5447 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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.
 

diff --git a/doc/forum/Git-annex_fsck_backend_warning/comment_2_a5415299d07283f393319b37ba9335ff._comment b/doc/forum/Git-annex_fsck_backend_warning/comment_2_a5415299d07283f393319b37ba9335ff._comment
new file mode 100644 (file)
index 0000000..e290e71
--- /dev/null
+++ b/doc/forum/Git-annex_fsck_backend_warning/comment_2_a5415299d07283f393319b37ba9335ff._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 2"""
+ date="2020-03-20T16:55:44Z"
+ content="""
+Fixed in git just now.
+"""]]