aboutsummaryrefslogtreecommitdiff
path: root/Git/DiffTree.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-10-17 14:51:19 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-10-17 14:51:19 -0400
commit8b8506748c362241d39cbf4cf04714f8462489da (patch)
treef6eadd37acce7dff2304ad2288335df7ed8f77c9 /Git/DiffTree.hs
parente1562f96d2193259e642d417a27bd8275fbc0144 (diff)
use TopFilePath for DiffTree and LsTree
Diffstat (limited to 'Git/DiffTree.hs')
-rw-r--r--Git/DiffTree.hs5
1 files changed, 3 insertions, 2 deletions
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