summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-02-23 18:30:11 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-02-23 18:30:11 -0400
commitcab5b78a7d08d8ed3d25751844e6aa43278fccfb (patch)
tree07a1808e896feba5b3943f1d2a862fdc8cd2b063
parentb2f63a097331b8e3b5a1fe177686da1dc412b723 (diff)
use getSha
-rw-r--r--Git/Tree.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/Git/Tree.hs b/Git/Tree.hs
index 290c88249..c4cbe03f1 100644
--- a/Git/Tree.hs
+++ b/Git/Tree.hs
@@ -17,6 +17,7 @@ import Git
import Git.FilePath
import Git.Types
import Git.Command
+import Git.Sha
import qualified Git.LsTree as LsTree
import qualified Utility.CoProcess as CoProcess
@@ -101,7 +102,7 @@ mkTree cp l = CoProcess.query cp send receive
RecordedSubTree f s _ -> mkTreeOutput 0o040000 TreeObject s f
NewSubTree _ _ -> error "recordSubTree internal error; unexpected NewSubTree"
hPutStr h "\NUL" -- signal end of tree to --batch
- receive h = Ref <$> hGetLine h
+ receive h = getSha "mktree" (hGetLine h)
mkTreeOutput :: FileMode -> ObjectType -> Sha -> TopFilePath -> String
mkTreeOutput fm ot s f = concat