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

more windows path fixes

Browse source 
Let git-style filepaths be looked up in the removeset, even though
windows-style filepaths are probably being fed into it.
This commit is contained in:
Joey Hess 2016-05-04 12:38:37 -04:00
parent 2cdfe33a4c
commit 066f5bcdcb
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

@ -202,8 +202,8 @@ adjustTree adjusttreeitem addtreeitems removefiles r repo =
addunderhere' <- liftIO $ mapM (recordSubTree h) addunderhere addunderhere' <- liftIO $ mapM (recordSubTree h) addunderhere
return (addunderhere'++l') return (addunderhere'++l')
removeset = S.fromList removefiles removeset = S.fromList $ map (normalise . gitPath) removefiles
removed (TreeBlob f _ _) = S.member f removeset removed (TreeBlob f _ _) = S.member (normalise (gitPath f)) removeset
removed _ = False removed _ = False
{- Assumes the list is ordered, with tree objects coming right before their {- Assumes the list is ordered, with tree objects coming right before their