Assistant, repair: Improved filtering out of git fsck lines about duplicate file...

diff --git a/CHANGELOG b/CHANGELOG
index 816c4d70cf347f85f12d94faeb4a8d9a8f275a60..8307252e7754c3035213793e032322ec829a5fb8 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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 f85023dc1cc9793dba6326e26f2a607cb423287b..e50b60715a900a0adc36ec3cf303bea6ef30b331 100644 (file)
--- 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)