From 8b8506748c362241d39cbf4cf04714f8462489da Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 17 Oct 2013 14:51:19 -0400 Subject: use TopFilePath for DiffTree and LsTree --- Git/DiffTree.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Git/DiffTree.hs') diff --git a/Git/DiffTree.hs b/Git/DiffTree.hs index 62330612c..e7787caee 100644 --- a/Git/DiffTree.hs +++ b/Git/DiffTree.hs @@ -20,6 +20,7 @@ import Common import Git import Git.Sha import Git.Command +import Git.FilePath import qualified Git.Filename import qualified Git.Ref @@ -29,7 +30,7 @@ data DiffTreeItem = DiffTreeItem , srcsha :: Sha -- nullSha if file was added , dstsha :: Sha -- nullSha if file was deleted , status :: String - , file :: FilePath + , file :: TopFilePath } deriving Show {- Diffs two tree Refs. -} @@ -86,7 +87,7 @@ parseDiffTree l = go l [] , srcsha = fromMaybe (error "bad srcsha") $ extractSha ssha , dstsha = fromMaybe (error "bad dstsha") $ extractSha dsha , status = s - , file = Git.Filename.decode f + , file = asTopFilePath $ Git.Filename.decode f } where readmode = fst . Prelude.head . readOct -- cgit v1.2.3