Merge branch 'master' into desymlink
Conflicts: Annex/CatFile.hs Annex/Content.hs Git/LsFiles.hs Git/LsTree.hs
This commit is contained in:
commit
b080a58b76
108 changed files with 2031 additions and 1615 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue