From 090a922a98779ca4c1a262f9e07e61b847210af5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 18 Oct 2016 11:19:41 -0400 Subject: [PATCH] Assistant, repair: Improved filtering out of git fsck lines about duplicate file entries in tree objects. --- CHANGELOG | 2 ++ Git/Fsck.hs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 816c4d70cf..8307252e77 100644 --- 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 Mon, 17 Oct 2016 12:46:54 -0400 diff --git a/Git/Fsck.hs b/Git/Fsck.hs index f85023dc1c..e50b60715a 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 : duplicateEntries: contains duplicate file entries" - | "duplicateEntries" `isPrefixOf` l = False + | "duplicateEntries" `isInfixOf` l = False | supportsNoDangling = True | otherwise = not ("dangling " `isPrefixOf` l) -- 2.30.2