mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

more windows path fixes

Browse source 
beneathSubTree can be called with both windows-style and git-style paths,
so needs to normalize to windows-style.
This commit is contained in:
Joey Hess 2016-05-04 12:36:50 -04:00
parent 2c2de1a9a1
commit 2cdfe33a4c
Failed to extract signature
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Git/Tree.hs
View file

@ -256,7 +256,7 @@ inTree :: (GitPath t, GitPath f) => t -> f -> Bool
inTree t f = gitPath t == takeDirectory (gitPath f) inTree t f = gitPath t == takeDirectory (gitPath f)
beneathSubTree :: (GitPath t, GitPath f) => t -> f -> Bool beneathSubTree :: (GitPath t, GitPath f) => t -> f -> Bool
beneathSubTree t f = prefix `isPrefixOf` gitPath f beneathSubTree t f = prefix `isPrefixOf` normalise (gitPath f)
where where
tp = gitPath t tp = gitPath t
prefix = if null tp then tp else addTrailingPathSeparator tp prefix = if null tp then tp else addTrailingPathSeparator (normalise tp)