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

allow \r in pointer files

Browse source 
git-annex doesn't write \r, but it can be present due to line ending
conversions or perhaps user edits.
This commit is contained in:
Joey Hess 2016-02-15 16:36:14 -04:00
parent cceff0e46c
commit 4d89a1ffd1
Failed to extract signature
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Annex/Link.hs
View file

@ -143,11 +143,14 @@ parseLinkOrPointer = parseLinkOrPointer' . decodeBS . L.take maxsz
maxsz = 81920 maxsz = 81920
parseLinkOrPointer' :: String -> Maybe Key parseLinkOrPointer' :: String -> Maybe Key
parseLinkOrPointer' s = headMaybe (lines (fromInternalGitPath s)) >>= go parseLinkOrPointer' = go . fromInternalGitPath . takeWhile (not . lineend)
where where
go l go l
| isLinkToAnnex l = file2key $ takeFileName l | isLinkToAnnex l = file2key $ takeFileName l
| otherwise = Nothing | otherwise = Nothing
lineend '\n' = True
lineend '\r' = True
lineend _ = False
formatPointer :: Key -> String formatPointer :: Key -> String
formatPointer k = formatPointer k =