diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-05-04 12:57:07 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-05-04 13:00:02 -0400 |
| commit | 774db02044054b2bb53449d02c91a3da5fa3fa0f (patch) | |
| tree | 3d3af19fb024b1d06484cc20205632661f7e9170 /Annex | |
| parent | e7ab0b404e3169d998a1c06d11600f6327193abe (diff) | |
more windows path fixes
normalize filepaths in the map because it may be constructed with
windows-style paths and then queried for git-style
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/AdjustedBranch.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Annex/AdjustedBranch.hs b/Annex/AdjustedBranch.hs index 2b014a12a..2baed04a0 100644 --- a/Annex/AdjustedBranch.hs +++ b/Annex/AdjustedBranch.hs @@ -481,12 +481,13 @@ reverseAdjustedTree basis adj csha = do where reverseadj = reverseAdjustment adj propchanges changes ti@(TreeItem f _ _) = - case M.lookup f m of + case M.lookup (norm f) m of Nothing -> return (Just ti) -- not changed Just change -> adjustTreeItem reverseadj change where - m = M.fromList $ map (\i@(TreeItem f' _ _) -> (f', i)) $ + m = M.fromList $ map (\i@(TreeItem f' _ _) -> (norm f', i)) $ map diffTreeToTreeItem changes + norm = normalise . getTopFilePath diffTreeToTreeItem :: Git.DiffTree.DiffTreeItem -> TreeItem diffTreeToTreeItem dti = TreeItem |