diff options
Diffstat (limited to 'Git')
| -rw-r--r-- | Git/DiffTree.hs | 4 | ||||
| -rw-r--r-- | Git/UnionMerge.hs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Git/DiffTree.hs b/Git/DiffTree.hs index 5cdcc16bc..5dd4bde2d 100644 --- a/Git/DiffTree.hs +++ b/Git/DiffTree.hs @@ -36,12 +36,12 @@ isDiffOf diff f = case getTopFilePath f of {- Diffs two tree Refs. -} diffTree :: Ref -> Ref -> Repo -> IO ([DiffTreeItem], IO Bool) diffTree src dst = getdiff (Param "diff-tree") - [Param (fromRef src), Param (fromRef dst)] + [Param (fromRef src), Param (fromRef dst), Param "--"] {- Diffs two tree Refs, recursing into sub-trees -} diffTreeRecursive :: Ref -> Ref -> Repo -> IO ([DiffTreeItem], IO Bool) diffTreeRecursive src dst = getdiff (Param "diff-tree") - [Param "-r", Param (fromRef src), Param (fromRef dst)] + [Param "-r", Param (fromRef src), Param (fromRef dst), Param "--"] {- Diffs between a tree and the index. Does nothing if there is not yet a - commit in the repository. -} diff --git a/Git/UnionMerge.hs b/Git/UnionMerge.hs index 780861a41..26bb3d39f 100644 --- a/Git/UnionMerge.hs +++ b/Git/UnionMerge.hs @@ -51,7 +51,7 @@ mergeIndex h repo bs = forM_ bs $ \b -> {- For merging two trees. -} mergeTrees :: Ref -> Ref -> CatFileHandle -> Repo -> Streamer -mergeTrees (Ref x) (Ref y) h = doMerge h $ "diff-tree":diffOpts ++ [x, y] +mergeTrees (Ref x) (Ref y) h = doMerge h $ "diff-tree":diffOpts ++ [x, y, "--"] {- For merging a single tree into the index. -} mergeTreeIndex :: Ref -> CatFileHandle -> Repo -> Streamer |