diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-05-03 18:56:06 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-05-03 19:09:27 -0400 |
| commit | cbb02594a242e6961f09ca7eaad20ead51f23bbb (patch) | |
| tree | 5c3a791239d8da9d72a7dd7e070c4e9391188581 /Git | |
| parent | 21f5dcccff08d570c817b9fa2e03c5e87b26fc17 (diff) | |
avoid hardcoded slashes; broke on windows
Diffstat (limited to 'Git')
| -rw-r--r-- | Git/Tree.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Git/Tree.hs b/Git/Tree.hs index 3ef3f6870..00a966198 100644 --- a/Git/Tree.hs +++ b/Git/Tree.hs @@ -117,9 +117,9 @@ treeItemToTreeContent (TreeItem f m s) = TreeBlob f m s treeItemsToTree :: [TreeItem] -> Tree treeItemsToTree = go M.empty where - go m [] = Tree $ filter (notElem '/' . gitPath) (M.elems m) + go m [] = Tree $ filter inTopTree (M.elems m) go m (i:is) - | '/' `notElem` p = + | inTopTree p = go (M.insert p (treeItemToTreeContent i) m) is | otherwise = case M.lookup idir m of Just (NewSubTree d l) -> @@ -132,7 +132,7 @@ treeItemsToTree = go M.empty c = treeItemToTreeContent i addsubtree d m t - | elem '/' d = + | not (inTopTree d) = let m' = M.insert d t m in case M.lookup parent m' of Just (NewSubTree d' l) -> @@ -259,4 +259,4 @@ beneathSubTree :: (GitPath t, GitPath f) => t -> f -> Bool beneathSubTree t f = prefix `isPrefixOf` gitPath f where tp = gitPath t - prefix = if null tp then tp else tp ++ "/" + prefix = if null tp then tp else addTrailingPathSeparator tp |