diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-09-05 16:08:49 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-09-05 16:08:49 -0400 |
| commit | cc930a7439b448b89552fed843a549a5c4dbc074 (patch) | |
| tree | 1243695925d8374b8740ef0e5717398f10432dfe /Git | |
| parent | 21fe1ffb95947a480b1eaba127287fee96e552f7 (diff) | |
Assistant, repair: Filter out git fsck lines about duplicate file entries in tree objects.
Diffstat (limited to 'Git')
| -rw-r--r-- | Git/Fsck.hs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Git/Fsck.hs b/Git/Fsck.hs index f3e6db9f9..f85023dc1 100644 --- a/Git/Fsck.hs +++ b/Git/Fsck.hs @@ -104,6 +104,8 @@ findShas :: Bool -> String -> [Sha] findShas supportsNoDangling = catMaybes . map extractSha . concat . map words . filter wanted . lines where wanted l + -- Skip lines like "error in tree <sha>: duplicateEntries: contains duplicate file entries" + | "duplicateEntries" `isPrefixOf` l = False | supportsNoDangling = True | otherwise = not ("dangling " `isPrefixOf` l) |