From 066f5bcdcbda1e50dbc17f712b30dc28090de17f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 4 May 2016 12:38:37 -0400 Subject: [PATCH] more windows path fixes Let git-style filepaths be looked up in the removeset, even though windows-style filepaths are probably being fed into it. --- Git/Tree.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Git/Tree.hs b/Git/Tree.hs index b190def644..cfd5b910d8 100644 --- a/Git/Tree.hs +++ b/Git/Tree.hs @@ -202,8 +202,8 @@ adjustTree adjusttreeitem addtreeitems removefiles r repo = addunderhere' <- liftIO $ mapM (recordSubTree h) addunderhere return (addunderhere'++l') - removeset = S.fromList removefiles - removed (TreeBlob f _ _) = S.member f removeset + removeset = S.fromList $ map (normalise . gitPath) removefiles + removed (TreeBlob f _ _) = S.member (normalise (gitPath f)) removeset removed _ = False {- Assumes the list is ordered, with tree objects coming right before their