aboutsummaryrefslogtreecommitdiff
path: root/Git/DiffTree.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-01-06 20:38:02 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-01-06 20:38:02 -0400
commit6dab3f4271138bf732caa37338e79f96863923a3 (patch)
treed7ad969f0ab5c7294971b0a584d8cad82ead0659 /Git/DiffTree.hs
parent336a5da9097f9f2d6aa92188a05c5e7658f5a087 (diff)
optimise
d1ce927d95fe7c331cbff3317797a60aa288738b put a cat-file into the fast bloomfilter generation path. Instead, add another bloom filter which diffs from the work tree to the index. Also, pull the sha of the changed object out of the diffs, and cat that object directly, rather than indirecting through the filename. Finally, removed some hacks that are unncessary thanks to the worktree to index diff.
Diffstat (limited to 'Git/DiffTree.hs')
-rw-r--r--Git/DiffTree.hs5
1 files changed, 5 insertions, 0 deletions
diff --git a/Git/DiffTree.hs b/Git/DiffTree.hs
index fecc9307c..838114872 100644
--- a/Git/DiffTree.hs
+++ b/Git/DiffTree.hs
@@ -12,6 +12,7 @@ module Git.DiffTree (
diffTreeRecursive,
diffIndex,
diffWorkTree,
+ diffFiles,
diffLog,
) where
@@ -66,6 +67,10 @@ diffIndex' ref params repo =
, return ([], return True)
)
+{- Diff between the index and work tree. -}
+diffFiles :: [CommandParam] -> Repo -> IO ([DiffTreeItem], IO Bool)
+diffFiles = getdiff (Param "diff-files")
+
{- Runs git log in --raw mode to get the changes that were made in
- a particular commit. The output format is adjusted to be the same
- as diff-tree --raw._-}