diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-10-18 11:19:41 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-10-18 11:19:41 -0400 |
| commit | 591ac350c7e9dff8ace565096468932d7be556a2 (patch) | |
| tree | 837fdb88877e00782bc1b34f3e11796a9054da10 | |
| parent | cadf389a2f46cdb9320fc62c6cdc10f0500b42de (diff) | |
Assistant, repair: Improved filtering out of git fsck lines about duplicate file entries in tree objects.
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | Git/Fsck.hs | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -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 diff --git a/Git/Fsck.hs b/Git/Fsck.hs index f85023dc1..e50b60715 100644 --- a/Git/Fsck.hs +++ b/Git/Fsck.hs @@ -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) |