diff options
| author | Joey Hess <joeyh@joeyh.name> | 2020-05-04 15:38:39 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2020-05-04 15:38:39 -0400 |
| commit | 8c4352a0a544b2e5a4ed717999fc7c6ecb0a328f (patch) | |
| tree | d57aca56117598b06bf30e5a1ed96f4b77e51f09 /Git/DiffTreeItem.hs | |
| parent | 6ea7eac330f73699d965cef7b8ee23d7218415a8 (diff) | |
| download | git-repair-8c4352a0a544b2e5a4ed717999fc7c6ecb0a328f.tar.gz | |
merge from git-annex
* Improve fetching from a remote with an url in host:path format.
* Merge from git-annex.
Diffstat (limited to 'Git/DiffTreeItem.hs')
| -rw-r--r-- | Git/DiffTreeItem.hs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Git/DiffTreeItem.hs b/Git/DiffTreeItem.hs index ffda2e8..090ad3e 100644 --- a/Git/DiffTreeItem.hs +++ b/Git/DiffTreeItem.hs @@ -10,6 +10,7 @@ module Git.DiffTreeItem ( ) where import System.Posix.Types +import qualified Data.ByteString as S import Git.FilePath import Git.Types @@ -17,8 +18,8 @@ import Git.Types data DiffTreeItem = DiffTreeItem { srcmode :: FileMode , dstmode :: FileMode - , srcsha :: Sha -- nullSha if file was added - , dstsha :: Sha -- nullSha if file was deleted - , status :: String + , srcsha :: Sha -- null sha if file was added + , dstsha :: Sha -- null sha if file was deleted + , status :: S.ByteString , file :: TopFilePath } deriving Show |