Fix reversion in 6.20161012 that prevented adding files with a space in their name.
This commit is contained in:
parent
a986b12cf2
commit
b530e43285
3 changed files with 17 additions and 11 deletions
|
@ -3,6 +3,8 @@ git-annex (6.20161028) UNRELEASED; urgency=medium
|
|||
* Assistant, repair: Fix ignoring of git fsck errors due to
|
||||
duplicate file entries in tree objects.
|
||||
* Linux standalone: Fix location of locale files in the bundle.
|
||||
* Fix reversion in 6.20161012 that prevented adding files with a space
|
||||
in their name.
|
||||
|
||||
-- Joey Hess <id@joeyh.name> Mon, 31 Oct 2016 13:59:47 -0400
|
||||
|
||||
|
|
|
@ -109,17 +109,18 @@ query hdl object receive = CoProcess.query hdl send receive
|
|||
send to = hPutStrLn to (fromRef object)
|
||||
|
||||
parseResp :: Ref -> String -> Maybe ParsedResp
|
||||
parseResp object l = case words l of
|
||||
[sha, objtype, size]
|
||||
| length sha == shaSize ->
|
||||
case (readObjectType objtype, reads size) of
|
||||
(Just t, [(bytes, "")]) ->
|
||||
Just $ ParsedResp (Ref sha) bytes t
|
||||
_ -> Nothing
|
||||
| otherwise -> Nothing
|
||||
_
|
||||
| l == fromRef object ++ " missing" -> Just DNE
|
||||
| otherwise -> Nothing
|
||||
parseResp object l
|
||||
| " missing" `isSuffixOf` l -- less expensive than full check
|
||||
&& l == fromRef object ++ " missing" = Just DNE
|
||||
| otherwise = case words l of
|
||||
[sha, objtype, size]
|
||||
| length sha == shaSize ->
|
||||
case (readObjectType objtype, reads size) of
|
||||
(Just t, [(bytes, "")]) ->
|
||||
Just $ ParsedResp (Ref sha) bytes t
|
||||
_ -> Nothing
|
||||
| otherwise -> Nothing
|
||||
_ -> Nothing
|
||||
|
||||
{- Gets a list of files and directories in a tree. (Not recursive.) -}
|
||||
catTree :: CatFileHandle -> Ref -> IO [(FilePath, FileMode)]
|
||||
|
|
|
@ -24,3 +24,6 @@ add foo bar git-annex: unknown response from git cat-file ("HEAD:./foo bar missi
|
|||
CallStack (from HasCallStack):
|
||||
error, called at ./Git/CatFile.hs:102:28 in main:Git.CatFile
|
||||
"""]]
|
||||
|
||||
> What an embarrasing reversion. [[fixed|done]] and I'll push a release for
|
||||
> it right away. --[[Joey]]
|
||||
|
|
Loading…
Add table
Reference in a new issue