From 8c4352a0a544b2e5a4ed717999fc7c6ecb0a328f Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Mon, 4 May 2020 15:38:39 -0400
Subject: merge from git-annex

* Improve fetching from a remote with an url in host:path format.
* Merge from git-annex.
---
 Git/LsTree.hs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'Git/LsTree.hs')

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)
-- 
cgit v1.2.3