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

Assistant, repair: Improved filtering out of git fsck lines about duplicate file entries in tree objects.

Browse source
This commit is contained in:
Joey Hess 2016-10-18 11:19:41 -04:00
parent 6d4f446a06
commit 090a922a98
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG
View file

@ -7,6 +7,8 @@ git-annex (6.20161013) UNRELEASED; urgency=medium
* Improve style of offline html build of website.
* importfeed: Drop URL parameters from file extension.
Thanks, James MacMahon.
* Assistant, repair: Improved filtering out of git fsck lines about
duplicate file entries in tree objects.
-- Joey Hess <id@joeyh.name> Mon, 17 Oct 2016 12:46:54 -0400

2
Git/Fsck.hs
View file

@ -105,7 +105,7 @@ findShas supportsNoDangling = catMaybes . map extractSha . concat . map words .
where
wanted l
-- Skip lines like "error in tree <sha>: duplicateEntries: contains duplicate file entries"
| "duplicateEntries" `isPrefixOf` l = False
| "duplicateEntries" `isInfixOf` l = False
| supportsNoDangling = True
| otherwise = not ("dangling " `isPrefixOf` l)