diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-06 21:41:21 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-06 21:41:21 -0400 |
| commit | 17b2fab70b28d3d58bd6eb98daa24b1587c12ab5 (patch) | |
| tree | 8f56f6cefed15b0313b264e55b6c6a5e508c01cd /Git/DiffTree.hs | |
| parent | 59803f1595f16a53d789b98b8239b8e9afe7957f (diff) | |
Bugfix: A file named HEAD in the work tree could confuse some git commands run by git-annex.
Diffstat (limited to 'Git/DiffTree.hs')
| -rw-r--r-- | Git/DiffTree.hs | 2 |
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) ) |