mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

use TopFilePath for DiffTree and LsTree

Browse source
This commit is contained in:
Joey Hess 2013-10-17 14:51:19 -04:00
parent f40ed91276
commit d785432f78
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Git/DiffTree.hs
View file

@ -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