mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into relativepaths

Browse source
This commit is contained in:
Joey Hess 2015-01-06 21:41:25 -04:00
commit 676ef32547
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Git/DiffTree.hs
View file

@ -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)
)