From 4d89a1ffd1b4bfd423c11c9e703e9d2fb0f5fb25 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 15 Feb 2016 16:36:14 -0400 Subject: [PATCH] allow \r in pointer files git-annex doesn't write \r, but it can be present due to line ending conversions or perhaps user edits. --- Annex/Link.hs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Annex/Link.hs b/Annex/Link.hs index 4a3311af91..82543257d3 100644 --- a/Annex/Link.hs +++ b/Annex/Link.hs @@ -143,11 +143,14 @@ parseLinkOrPointer = parseLinkOrPointer' . decodeBS . L.take maxsz maxsz = 81920 parseLinkOrPointer' :: String -> Maybe Key -parseLinkOrPointer' s = headMaybe (lines (fromInternalGitPath s)) >>= go +parseLinkOrPointer' = go . fromInternalGitPath . takeWhile (not . lineend) where go l | isLinkToAnnex l = file2key $ takeFileName l | otherwise = Nothing + lineend '\n' = True + lineend '\r' = True + lineend _ = False formatPointer :: Key -> String formatPointer k =