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

Bugfix: A file named HEAD in the work tree could confuse some git commands run by git-annex.

Browse source
This commit is contained in:
Joey Hess 2015-01-06 21:41:21 -04:00
parent d7f1449b2b
commit adefcf189a
2 changed files with 3 additions and 1 deletions
Show stats 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 = diffIndex' ref params repo =
ifM (Git.Ref.headExists repo) ifM (Git.Ref.headExists repo)
( getdiff (Param "diff-index") ( getdiff (Param "diff-index")
( params ++ [Param $ fromRef ref] ) ( params ++ [Param $ fromRef ref] ++ [Param "--"] )
repo repo
, return ([], return True) , return ([], return True)
) )

2
debian/changelog vendored
View file

@ -15,6 +15,8 @@ git-annex (5.20141232) UNRELEASED; urgency=medium
* Generate shorter keys for WORM and URL, avoiding keys that are longer * Generate shorter keys for WORM and URL, avoiding keys that are longer
than used for SHA256, so as to not break on systems like Windows that than used for SHA256, so as to not break on systems like Windows that
have very small maximum path length limits. have very small maximum path length limits.
* Bugfix: A file named HEAD in the work tree could confuse some git commands
run by git-annex.
-- Joey Hess <id@joeyh.name> Fri, 02 Jan 2015 13:35:13 -0400 -- Joey Hess <id@joeyh.name> Fri, 02 Jan 2015 13:35:13 -0400