diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-08-17 14:46:33 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-08-17 14:46:33 -0400 |
| commit | dbd6f8c1425e1d928d7fcf53f53357c4e51179fb (patch) | |
| tree | 5c0d0d4d4b7f7c5581afa6bb88b66bfcbb195b63 | |
| parent | 60ecfff58955539c80ea91790e1526505a748fc0 (diff) | |
Prevent spaces from being embedded in the name of new WORM keys, as that handing spaces in keys would complicate things like the external special remote protocol.
| -rw-r--r-- | Annex/Locations.hs | 4 | ||||
| -rw-r--r-- | CHANGELOG | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Annex/Locations.hs b/Annex/Locations.hs index 494badcc6..e12920091 100644 --- a/Annex/Locations.hs +++ b/Annex/Locations.hs @@ -413,7 +413,7 @@ gitAnnexAssistantDefaultDir :: FilePath gitAnnexAssistantDefaultDir = "annex" {- Sanitizes a String that will be used as part of a Key's keyName, - - dealing with characters that cause problems on substandard filesystems. + - dealing with characters that cause problems. - - This is used when a new Key is initially being generated, eg by getKey. - Unlike keyFile and fileKey, it does not need to be a reversable @@ -430,7 +430,7 @@ preSanitizeKeyName = concatMap escape where escape c | isAsciiUpper c || isAsciiLower c || isDigit c = [c] - | c `elem` ".-_ " = [c] -- common, assumed safe + | c `elem` ".-_" = [c] -- common, assumed safe | c `elem` "/%:" = [c] -- handled by keyFile -- , is safe and uncommon, so will be used to escape -- other characters. By itself, it is escaped to @@ -18,6 +18,9 @@ git-annex (6.20170521) UNRELEASED; urgency=medium * Added remote configuration settings annex-ignore-command and annex-sync-command, which are dynamic equivilants of the annex-ignore and annex-sync configurations. + * Prevent spaces from being embedded in the name of new WORM keys, + as that handing spaces in keys would complicate things like the + external special remote protocol. -- Joey Hess <id@joeyh.name> Sat, 17 Jun 2017 13:02:24 -0400 |