diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-05-04 12:38:37 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-05-04 12:42:05 -0400 |
| commit | e7ab0b404e3169d998a1c06d11600f6327193abe (patch) | |
| tree | 044f46b4f2916105560a32692f45087541f648d6 /Git | |
| parent | 53912aaac792be395414271906e59dec916c9a36 (diff) | |
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.
Diffstat (limited to 'Git')
| -rw-r--r-- | Git/Tree.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Git/Tree.hs b/Git/Tree.hs index b190def64..cfd5b910d 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 |