summaryrefslogtreecommitdiff
path: root/Git
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-01-06 21:41:25 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-01-06 21:41:25 -0400
commit3e9ff821877b9f7a5b486bffe6dac2f31ac5887b (patch)
treef34acf815480bde3bba281a8d64b90b86cc3f5f7 /Git
parentb68a9a8a4d4380afb7e89041741d957bcec3b0c3 (diff)
parent17b2fab70b28d3d58bd6eb98daa24b1587c12ab5 (diff)
Merge branch 'master' into relativepaths
Diffstat (limited to 'Git')
-rw-r--r--Git/DiffTree.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Git/DiffTree.hs b/Git/DiffTree.hs
index 5981ed1a2..3ea14a15f 100644
--- a/Git/DiffTree.hs
+++ b/Git/DiffTree.hs
@@ -61,7 +61,7 @@ diffIndex' :: Ref -> [CommandParam] -> Repo -> IO ([DiffTreeItem], IO Bool)
diffIndex' ref params repo =
ifM (Git.Ref.headExists repo)
( getdiff (Param "diff-index")
- ( params ++ [Param $ fromRef ref] )
+ ( params ++ [Param $ fromRef ref] ++ [Param "--"] )
repo
, return ([], return True)
)