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:
		
					parent
					
						
							
								6222277179
							
						
					
				
			
			
				commit
				
					
						bbe977a2b6
					
				
			
		
					 3 changed files with 11 additions and 1 deletions
				
			
		| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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.
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -0,0 +1,7 @@
 | 
			
		|||
[[!comment format=mdwn
 | 
			
		||||
 username="joey"
 | 
			
		||||
 subject="""comment 2"""
 | 
			
		||||
 date="2020-03-20T16:55:44Z"
 | 
			
		||||
 content="""
 | 
			
		||||
Fixed in git just now.
 | 
			
		||||
"""]]
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue