diff options
| author | Joey Hess <joeyh@joeyh.name> | 2020-05-04 15:38:39 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2020-05-04 15:38:39 -0400 |
| commit | 8c4352a0a544b2e5a4ed717999fc7c6ecb0a328f (patch) | |
| tree | d57aca56117598b06bf30e5a1ed96f4b77e51f09 /Git/LsTree.hs | |
| parent | 6ea7eac330f73699d965cef7b8ee23d7218415a8 (diff) | |
| download | git-repair-8c4352a0a544b2e5a4ed717999fc7c6ecb0a328f.tar.gz | |
merge from git-annex
* Improve fetching from a remote with an url in host:path format.
* Merge from git-annex.
Diffstat (limited to 'Git/LsTree.hs')
| -rw-r--r-- | Git/LsTree.hs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Git/LsTree.hs b/Git/LsTree.hs index a3d8383..ead501f 100644 --- a/Git/LsTree.hs +++ b/Git/LsTree.hs @@ -21,7 +21,6 @@ module Git.LsTree ( import Common import Git import Git.Command -import Git.Sha import Git.FilePath import qualified Git.Filename import Utility.Attoparsec @@ -94,10 +93,10 @@ parserLsTree = TreeItem <$> octal <* A8.char ' ' -- type - <*> A.takeTill (== 32) + <*> A8.takeTill (== ' ') <* A8.char ' ' -- sha - <*> (Ref . decodeBS' <$> A.take shaSize) + <*> (Ref <$> A8.takeTill (== '\t')) <* A8.char '\t' -- file <*> (asTopFilePath . Git.Filename.decode <$> A.takeByteString) |