diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-12-13 00:29:06 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-12-13 00:29:06 -0400 |
| commit | de6406afce6de0cf8a48bc2ecf9be1e7de93e40e (patch) | |
| tree | 08705fab60c11d4073734a8c2500a88b1aab7852 /Git/LsTree.hs | |
| parent | 3e55a8f164d67d5bd1ef86ae2f38fb2c6c3a51b2 (diff) | |
| parent | 94554782894ec6c26da3b46312d5d1d16d596458 (diff) | |
Merge branch 'master' into desymlink
Conflicts:
Annex/CatFile.hs
Annex/Content.hs
Git/LsFiles.hs
Git/LsTree.hs
Diffstat (limited to 'Git/LsTree.hs')
| -rw-r--r-- | Git/LsTree.hs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Git/LsTree.hs b/Git/LsTree.hs index 373bf0006..c61ae7fab 100644 --- a/Git/LsTree.hs +++ b/Git/LsTree.hs @@ -48,11 +48,11 @@ parseLsTree l = TreeItem , sha = s , file = Git.Filename.decode f } - where - -- l = <mode> SP <type> SP <sha> TAB <file> - -- All fields are fixed, so we can pull them out of - -- specific positions in the line. - (m, past_m) = splitAt 7 l - (t, past_t) = splitAt 4 past_m - (s, past_s) = splitAt shaSize $ Prelude.tail past_t - f = Prelude.tail past_s + where + -- l = <mode> SP <type> SP <sha> TAB <file> + -- All fields are fixed, so we can pull them out of + -- specific positions in the line. + (m, past_m) = splitAt 7 l + (t, past_t) = splitAt 4 past_m + (s, past_s) = splitAt shaSize $ Prelude.tail past_t + f = Prelude.tail past_s |